starting jscrpt
conflict resolved