conflicts

(dcintron @ DCintron-MBP): ~/Loop
⇢  git merge upstream/master
warning: Cannot merge binary files: Carthage/Build/iOS/xDripG5.framework/xDripG5 (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/x86_64.swiftmodule (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/i386.swiftmodule (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm64.swiftmodule (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm.swiftmodule (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/SwiftCharts.framework/SwiftCharts (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/ShareClient.framework/ShareClient (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkKit (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkDeviceTableViewCell.nib (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftmodule (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftmodule (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftmodule (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftmodule (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/RileyLinkBLEKit.framework/RileyLinkBLEKit (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/NightscoutUploadKit.framework/NightscoutUploadKit (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftmodule (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftmodule (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftmodule (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftmodule (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftmodule (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftmodule (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftmodule (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftmodule (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/MinimedKit.framework/MinimedKit (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/LoopKit.framework/TextFieldTableViewCell.nib (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/LoopKit.framework/RepeatingScheduleValueTableViewCell.nib (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/LoopKit.framework/LoopKit (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/LoopKit.framework/GlucoseRangeTableViewCell.nib (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftmodule (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftmodule (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftmodule (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftmodule (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/InsulinKit.framework/InsulinKit (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/jGX-GA-nlH-view-ccM-3y-LQM.nib (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/UITableViewController-jGX-GA-nlH.nib (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/Crypto.framework/Crypto (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/CommonCrypto.framework/CommonCrypto (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UITableViewController-rUL-yg-cFX.nib (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/CarbKit.framework/CarbKit (HEAD vs. upstream/master)
warning: Cannot merge binary files: Carthage/Build/iOS/AmplitudeFramework.framework/AmplitudeFramework (HEAD vs. upstream/master)
Auto-merging Loop/Info.plist
Auto-merging Loop/Base.lproj/Main.storyboard
CONFLICT (content): Merge conflict in Loop/Base.lproj/Main.storyboard
Auto-merging Loop.xcodeproj/project.pbxproj
CONFLICT (content): Merge conflict in Loop.xcodeproj/project.pbxproj
Auto-merging Carthage/Build/iOS/xDripG5.framework/xDripG5
CONFLICT (content): Merge conflict in Carthage/Build/iOS/xDripG5.framework/xDripG5
Auto-merging Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/x86_64.swiftmodule
CONFLICT (content): Merge conflict in Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/x86_64.swiftmodule
Auto-merging Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/i386.swiftmodule
CONFLICT (content): Merge conflict in Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/i386.swiftmodule
Auto-merging Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm64.swiftmodule
CONFLICT (content): Merge conflict in Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm64.swiftmodule
Auto-merging Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm.swiftmodule
CONFLICT (content): Merge conflict in Carthage/Build/iOS/xDripG5.framework/Modules/xDripG5.swiftmodule/arm.swiftmodule
Auto-merging Carthage/Build/iOS/SwiftCharts.framework/SwiftCharts
CONFLICT (content): Merge conflict in Carthage/Build/iOS/SwiftCharts.framework/SwiftCharts
Auto-merging Carthage/Build/iOS/ShareClient.framework/ShareClient
CONFLICT (content): Merge conflict in Carthage/Build/iOS/ShareClient.framework/ShareClient
Auto-merging Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkKit
CONFLICT (content): Merge conflict in Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkKit
Auto-merging Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkDeviceTableViewCell.nib
CONFLICT (content): Merge conflict in Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkDeviceTableViewCell.nib
Auto-merging Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftmodule
CONFLICT (content): Merge conflict in Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftmodule
Auto-merging Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftmodule
CONFLICT (content): Merge conflict in Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftmodule
Auto-merging Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftmodule
CONFLICT (content): Merge conflict in Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftmodule
Auto-merging Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftmodule
CONFLICT (content): Merge conflict in Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftmodule
Auto-merging Carthage/Build/iOS/RileyLinkBLEKit.framework/RileyLinkBLEKit
CONFLICT (content): Merge conflict in Carthage/Build/iOS/RileyLinkBLEKit.framework/RileyLinkBLEKit
Auto-merging Carthage/Build/iOS/NightscoutUploadKit.framework/NightscoutUploadKit
CONFLICT (content): Merge conflict in Carthage/Build/iOS/NightscoutUploadKit.framework/NightscoutUploadKit
Auto-merging Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftmodule
CONFLICT (content): Merge conflict in Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftmodule
Auto-merging Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftmodule
CONFLICT (content): Merge conflict in Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftmodule
Auto-merging Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftmodule
CONFLICT (content): Merge conflict in Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftmodule
Auto-merging Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftmodule
CONFLICT (content): Merge conflict in Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftmodule
Auto-merging Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftmodule
CONFLICT (content): Merge conflict in Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftmodule
Auto-merging Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftmodule
CONFLICT (content): Merge conflict in Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftmodule
Auto-merging Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftmodule
CONFLICT (content): Merge conflict in Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftmodule
Auto-merging Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftmodule
CONFLICT (content): Merge conflict in Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftmodule
Auto-merging Carthage/Build/iOS/MinimedKit.framework/MinimedKit
CONFLICT (content): Merge conflict in Carthage/Build/iOS/MinimedKit.framework/MinimedKit
Auto-merging Carthage/Build/iOS/LoopKit.framework/TextFieldTableViewCell.nib
CONFLICT (content): Merge conflict in Carthage/Build/iOS/LoopKit.framework/TextFieldTableViewCell.nib
Auto-merging Carthage/Build/iOS/LoopKit.framework/RepeatingScheduleValueTableViewCell.nib
CONFLICT (content): Merge conflict in Carthage/Build/iOS/LoopKit.framework/RepeatingScheduleValueTableViewCell.nib
Auto-merging Carthage/Build/iOS/LoopKit.framework/LoopKit
CONFLICT (content): Merge conflict in Carthage/Build/iOS/LoopKit.framework/LoopKit
Auto-merging Carthage/Build/iOS/LoopKit.framework/GlucoseRangeTableViewCell.nib
CONFLICT (content): Merge conflict in Carthage/Build/iOS/LoopKit.framework/GlucoseRangeTableViewCell.nib
Auto-merging Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftmodule
CONFLICT (content): Merge conflict in Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftmodule
Auto-merging Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftmodule
CONFLICT (content): Merge conflict in Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftmodule
Auto-merging Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftmodule
CONFLICT (content): Merge conflict in Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftmodule
Auto-merging Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftmodule
CONFLICT (content): Merge conflict in Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftmodule
Auto-merging Carthage/Build/iOS/InsulinKit.framework/InsulinKit
CONFLICT (content): Merge conflict in Carthage/Build/iOS/InsulinKit.framework/InsulinKit
Auto-merging Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/jGX-GA-nlH-view-ccM-3y-LQM.nib
CONFLICT (content): Merge conflict in Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/jGX-GA-nlH-view-ccM-3y-LQM.nib
Auto-merging Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/UITableViewController-jGX-GA-nlH.nib
CONFLICT (content): Merge conflict in Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/UITableViewController-jGX-GA-nlH.nib
Auto-merging Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit
CONFLICT (content): Merge conflict in Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit
Auto-merging Carthage/Build/iOS/Crypto.framework/Crypto
CONFLICT (content): Merge conflict in Carthage/Build/iOS/Crypto.framework/Crypto
Auto-merging Carthage/Build/iOS/CommonCrypto.framework/CommonCrypto
CONFLICT (content): Merge conflict in Carthage/Build/iOS/CommonCrypto.framework/CommonCrypto
Auto-merging Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib
CONFLICT (content): Merge conflict in Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib
Auto-merging Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UITableViewController-rUL-yg-cFX.nib
CONFLICT (content): Merge conflict in Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UITableViewController-rUL-yg-cFX.nib
Auto-merging Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib
CONFLICT (content): Merge conflict in Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib
Auto-merging Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib
CONFLICT (content): Merge conflict in Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib
Auto-merging Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib
CONFLICT (content): Merge conflict in Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib
Auto-merging Carthage/Build/iOS/CarbKit.framework/CarbKit
CONFLICT (content): Merge conflict in Carthage/Build/iOS/CarbKit.framework/CarbKit
Auto-merging Carthage/Build/iOS/AmplitudeFramework.framework/AmplitudeFramework
CONFLICT (content): Merge conflict in Carthage/Build/iOS/AmplitudeFramework.framework/AmplitudeFramework
Auto-merging Cartfile.resolved
CONFLICT (content): Merge conflict in Cartfile.resolved
Automatic merge failed; fix conflicts and then commit the result.

The conflicts in Carthage/ and Cartfile.resolved might be easier to resolve.

The conflict in Loop.xcodeproj/project.pbxproj will be more difficult.