Commiting vim-surround
Merge solved