js changes, need to discard and pull from remote
merge repo