made changs to the index file
fixed conflicts