Revert to ultisnips
Resolve merge conflicts