fixing some merge conflicts in js libraries