Remove svn conflict marker.