rm conflict marker