Added accessor for id of node
Fix merge conflict