Remove conflict statements