cleaned up some js code
merge conflict resolved