Remove merge conflict stuff