Removed conflict files.