fixed checked-in conflict marker