bug fixes
fix conflict