changed some styling
fixed conflicts