mod find stock out
fix conflicts schema