Add graph2d directive
Fixed merge conflicts