fixing a unit test and cleaning up a botched conflict resolution.