so many things
accepting merge changes
Merge branch 'master' of github.com:Iancam/pantry
changed things
merge conflicts