vimperatorrc: resolved merge conflict