message: another merge issue
diff: default_platform(:ios)
  platform :ios do
  + before_all do
  + setup_circle_ci
  + end
  +
  desc "Push a new beta build to TestFlight"
  lane :beta do
  increment_build_number(xcodeproj: "GaloyApp.xcodeproj")
  