more aesthetics
fixed conflicts