change index in testing
change index in master
resolve conflict for index