Fix diagram fragment styling, cleanup, and alignment correction
Update Merge recursive diagram with flat look
Update Merge fast-forward diagram with flat look