diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
index 284721356f..bfc3b4cee2 100644
--- a/buildSrc/src/main/kotlin/BuildConfig.kt
+++ b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -3,8 +3,8 @@ package com.unciv.build
 object BuildConfig {
     const val kotlinVersion = "1.5.30"
     const val appName = "Unciv"
-    const val appCodeNumber = 649
-    const val appVersion = "3.18.5"
+    const val appCodeNumber = 650
+    const val appVersion = "3.18.5-patch1"
 
     const val gdxVersion = "1.10.0"
     const val roboVMVersion = "2.3.1"
diff --git a/core/src/com/unciv/logic/automation/NextTurnAutomation.kt b/core/src/com/unciv/logic/automation/NextTurnAutomation.kt
index 4d331739da..8992fd99fa 100644
--- a/core/src/com/unciv/logic/automation/NextTurnAutomation.kt
+++ b/core/src/com/unciv/logic/automation/NextTurnAutomation.kt
@@ -87,12 +87,16 @@ object NextTurnAutomation {
                 tradeLogic.acceptTrade()
                 otherCiv.addNotification("[${civInfo.civName}] has accepted your trade request", NotificationIcon.Trade, civInfo.civName)
             } else {
+                /* Currently disabled until we solve the problems in https://github.com/yairm210/Unciv/issues/5728
+
                 val counteroffer = getCounteroffer(civInfo, tradeRequest)
                 if (counteroffer != null) {
                     otherCiv.addNotification("[${civInfo.civName}] has made a counteroffer to your trade request", NotificationIcon.Trade, civInfo.civName)
                     otherCiv.tradeRequests.add(counteroffer)
                 } else
                     otherCiv.addNotification("[${civInfo.civName}] has denied your trade request", NotificationIcon.Trade, civInfo.civName)
+
+                 */
             }
         }
         civInfo.tradeRequests.clear()
diff --git a/core/src/com/unciv/logic/city/CityInfoConquestFunctions.kt b/core/src/com/unciv/logic/city/CityInfoConquestFunctions.kt
index 16c5dd816c..98d10aad4b 100644
--- a/core/src/com/unciv/logic/city/CityInfoConquestFunctions.kt
+++ b/core/src/com/unciv/logic/city/CityInfoConquestFunctions.kt
@@ -58,7 +58,6 @@ class CityInfoConquestFunctions(val city: CityInfo){
             }
 
             // Remove all buildings provided for free from here to other cities (e.g. CN Tower)
-            println("Removing buildings: ${cityConstructions.freeBuildingsProvidedFromThisCity}")
             for ((cityId, buildings) in cityConstructions.freeBuildingsProvidedFromThisCity) {
                 val city = oldCiv.cities.firstOrNull { it.id == cityId } ?: continue
                 println("Removing buildings $buildings from city ${city.name}")
diff --git a/core/src/com/unciv/logic/civilization/CivInfoStats.kt b/core/src/com/unciv/logic/civilization/CivInfoStats.kt
index 7f5b882942..2b3c74a48e 100644
--- a/core/src/com/unciv/logic/civilization/CivInfoStats.kt
+++ b/core/src/com/unciv/logic/civilization/CivInfoStats.kt
@@ -45,7 +45,7 @@ class CivInfoStats(val civInfo: CivilizationInfo) {
         }
         // Apply global discounts
         for (unique in civInfo.getMatchingUniques(UniqueType.UnitMaintenanceDiscountGlobal, StateForConditionals(civInfo))) {
-            for (unit in unitsToPayFor.filter{it.matchesFilter(unique.params[1])}){
+            for (unit in unitsToPayFor.filter { it.matchesFilter(unique.params[1]) }) {
                 unit.maintenance *= unique.params[0].toPercent()
             }
         }