Remove merge conflict thingy