Probable merge conflict