Index changes
fixed conflicts