merged
fixed conflicts
formatting
fixed conflicts