bug fixes
fixed merge conflict