JS

fixed Javascript conflicts