Fix size of graphs
Fix merge conflict