Merge conflict
Complete snippet conversion for now