finished user review formatting
fixed conflicts