fix merge conflicts
diff --git a/distill/algorithms/graphs/graph.py b/distill/algorithms/graphs/graph.py
old mode 100644
new mode 100755