Rescue composer.lock file from conflicts