node conventions
merge