reported error code “1” when it ended: error: your local changes to the following files would be overwritten by merge: composer.lock please commit your changes or stash them before you merge. aborting
error: you have not concluded your merge (merge_head exists). hint: please, commit your changes before merging. fatal: exiting because of unfinished merge.