expiring done in stock management
fixing conflict during merging exp and dev, expiring stock management done