change index file - testing branch merge conflict resoluting