minor fixes
resolved conflict