Block Merge Conflicts