Adding the node plugin
Fixing merge conflict