Remove conflict errors