more minor housekeeping
resolved conflict