add conflict functions
Merge pull request #75 from jezell/add-conflict-to-index

Add index conflict functions