Remove Conflicts in Javascript