Im getting the foll error when i run build In JsonFile.php line 345:
"./composer.lock" does not contain valid JSON
Parse error on line 2601:
... }, {<<<<<<< Updated upst
--------------------^
Expected one of: 'STRING', '}' while running build command. docker/sdk up --build