some js change
merged