Conflict sort

Sorting a wee conflict that was thrown up between the two index files
in each branch