gemfile edit
conflicts
pulling
Merge branch 'master' of https://github.com/krochmal/memegen
pulling
mem add form
Merge branch 'master' of https://github.com/krochmal/memegen
conflicts
group show init
Merge branch 'master' of https://github.com/krochmal/memegen
conflicts