user/jszakmeister: add [n and ]n mappings to jump between conflicts

This is inspired by vim-unimpaired, but different.  vim-unimpaired jumps
between the various portions of a conflict, whereas this jumps only to
the beginning of a conflict.