fixed merge conflicts in graphDrawer