Updated with Jedi Vim
Merging files