added node modules
changed stop and land around
conflict merge