vim: fix merge failure, remove dead code
vim: fix merge failure, remove dead code

haselwarter/merlin,chriskonstad/merlin,ocaml/merlin,fxfactorial/merlin,rgrinberg/merlin,the-lambda-church/merlin,neojski/merlin,dra27/merlin,rgrinberg/merlin,rgrinberg/merlin,chriskonstad/merlin,haselwarter/merlin,neojski/merlin,ocaml/merlin,chambart/merlin,haselwarter/merlin,fxfactorial/merlin,chambart/merlin,the-lambda-church/merlin,dra27/merlin,ocaml/merlin,dra27/merlin,rgrinberg/merlin,chambart/merlin,fxfactorial/merlin,ocaml/merlin,dra27/merlin,neojski/merlin,chambart/merlin,haselwarter/merlin,neojski/merlin,fxfactorial/merlin,the-lambda-church/merlin