Missed merge conflict