Remove merge conflict rubbish