Update pouch
Fix changes conflict bug