added fixes for Appacitive object nodejs
fixed conflicts
fixed conflicts