change snippets
fix conflicts