gemfile changes.
fixs conflict in application.html.erb