Remove merge errors