new js assert snippets
fix merge conflicts