changes to index
some stuff
resolved a conflict