Graph node class
Graph class
Merge conflict resoluyion