fix merge conflicts in lock file