vim-lily: missing conflict