fixed pantry model from conflict