IndexEntry.xs: Added
Index.xs: Added conflicts() methods
15-merge.t: Added tests for conflicts
IndexEntry.pm: Added documentation
Index.pm: Added documentation for conflicts() method