Node set up
merge conflict resolved