minor cleanup
resolved conflict