fixedShapeGraphics
Fixed merge conflicts for drawing graphics