format
fixed conflicts