fixed width
fixed conflicts