added styling
fixed conflicts