Removing merge conflict info.