fixes
fixed merge conflicts