Removed merge conflict info from head