updating updating
fixed a merge issue in the js