scripting-snippets submodule
fix conflict