add new snippets
fix conflicts