Removes conflict file.