fixed false preloaded conflict resolution, fixed compilation error
recompiled javascript