merge conflicts in lock