added the locks
merge-o-la
merge-d