resolving gemfile lock merge issue