add in the JS
resolve merge conflict