Index merge methods

This adds two methods that are required for merging, ```has_conflicts``` and ```conflict_cleanup```. This PR does not have the associated test cases, as this actually requires merges (PR #31).