lock isnt part of merge anymore.