trying to clean up after a sloppy conflict resolution