fixed display order
fixed conflicts