remove marks generated on git conflict