changes
response to tips
conflict removed gemfile