design
fixed conflicts