only show orders that have not been picked up in urgent orders
fix git conflicts