Conflicts: Cartfile Cartfile.resolved Nextcloud.xcodeproj/project.pbxproj iOSClient/Main/Main.storyboard