fixed layout
fixed conflicts