added different_degrees invariant to gt.py
fixed a merge conflict