Add Vim mapping for searching through merge conflicts