hopefully caught all the conflicts
fixed conflicts from formatting merge