cli: Add prev/next --conflict, which allows you to jump to the next conflict.

cli: Add prev/next --conflict, which allows you to jump to the next conflict. #1686