order items work, yippie
fix merge