Make merge return message to say conflict happened when conflicted merge
Test merge says conflict happened when it did
undo accidental disabling of all tests but this one
Test merge conflict reflected in index