bug fixes
merge conflict resolved