That's a frikkin' merge conflict, man!