Detect conflicts in the index

This PR adds support for getting index entries that represent a conflict.