Add looking up conflicts in an Index
Move merge tests to their own file

The method is in Repository, but the merge functionality is separate. We
will introduce more tests in this area later.
Add tests for Index conflict access