Allow `dp` to work in visual mode during a merge conflict

Just setting `vnoremap` where there was also `nnoremap`. Being able to easily put line selections during a merge conflict is really useful.