add no conflict function
build
update test
version bump and fix a couple typos in the package.json
forgot to update shim
Merge branch 'master' into no-conflict
reposity instead of repositories