fixed conflicts on js