Fixed conflicts in js