cleaned up merge, fixed conflicts