Reverting
Remove ultisnips
Fix conflicts
Remove ultisnips
Readd ultisnips