bug fixes
fix merge conflicts