Fixed critical bug with queue order
Fixed merge conflict