merge issue in gemfile corrected