Added Vim to my preferences
merge conflicts