updates
conflicts in stock_entry
[Bug Fixes][Sample Allocation]