fixed merge conflicts and CRUD for snippet model