bug fixes
merge conflict