index last commit
Index merge fixed