Removed conflict origin file.