syling
fixed conflicts