minor fixes
fixed merge conflict