minor fixes
conflicts resolved