fixed conflicts on index