remove diff conflict markers