Trouble with GraphManagerTest
Fixed merge conflict