Remove conflict files from upstream merge