repair commit (create and retrieve works, newIndex is unfinished)
merge conflicts solved