Js Updated
Conflicts Resolved