Remove spurious head merge conflict thingy....