Fixes
fixed merge errors