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