Working on comparison graphs
Fix merge conflicts