Design changes
Conflict removed
Gemfile updated
gemfile
changes
chnages
changes