minor fixes
resolving conflict