Improve the “Find Next Conflict” macro bound to ⌃|

Pressing ⌃| when already at the start of a merge conflict will now find the next merge conflict (previously it would find the merge conflict “at the caret”).