fix conflict marker in comment