Remove merge conflict errors