Revert "conflicts"

This reverts commit b4811b365146708cf5e96de12867daaa4dab6666.
Revert "many edits but there is a bug.."

This reverts commit 9b5d786fb3ed12377c5fef7b49c9834537c103ae.
mode indods, indpaths inside class Graph