fix exit segue for create meal request
fix merge conflict