.

FreeAPS/Sources/Models/FreeAPSSettings.swift

@@ -52,7 +52,6 @@ struct FreeAPSSettings: JSON, Equatable {
     var sweetMeals: Bool = false
     var sweetMealFactor: Decimal = 2
     var displayPredictions: Bool = true
-
 }
 
 extension FreeAPSSettings: Decodable {

FreeAPS/Sources/Modules/Bolus/BolusStateModel.swift

@@ -83,12 +83,9 @@ extension Bolus {
             useCalc = settings.settings.useCalc
             fattyMeals = settings.settings.fattyMeals
             fattyMealFactor = settings.settings.fattyMealFactor
-<<<<<<< HEAD
             sweetMeals = settings.settings.sweetMeals
             sweetMealFactor = settings.settings.sweetMealFactor
-=======
             displayPredictions = settings.settings.displayPredictions
->>>>>>> upstream/dev
 
             if waitForSuggestionInitial {
                 apsManager.determineBasal()