minor bug fixes
fixed conflicts