updating provisions for node
fixing merge conflicts