bug fixes
conflicts