changes to index (mainly)
resolved conflicts in index