styling changes
fixed conflicts