Sorted merge conflict