fix checked-in conflicts