[WIP] Conflicts in the index

:construction: 

This PR will update our Index API to match `libgit2`'s in terms of conflict handling.