Fix merge conflics in gemfile