small stuff
resolved spurious conflict