remove merge conflict info