fixed conflicts in js