Remove conflict language