Removing merge conflict files.