Graph generation
Fix merge conflict