Manually re-merge javascript file 

Prior auto merge did not go well