oops. accidentally removed too much during conflict res