gemfile updated
added tip response
conflict removed