diff --git a/build.gradle b/build.gradle
index 175a16fd8..6f6050e22 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,8 +46,8 @@ android {
 
     defaultConfig {
         applicationId 'de.dennisguse.opentracks'
-        versionCode = 6030
-        versionName "v4.17.8"
+        versionCode 6095
+        versionName "v4.18.0"
 
         buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""
 
diff --git a/fastlane/metadata/android/en-US/changelogs/6095.txt b/fastlane/metadata/android/en-US/changelogs/6095.txt
new file mode 100644
index 000000000..dd9e9a8e7
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/6095.txt
@@ -0,0 +1,11 @@
+v4.18.0: OpenTracks
+
+Changes:
+- GPS disabled warning can be disabled
+
+Bugfix:
+- BottomAppBar overlapped content
+
+Developer:
+- Use record Position instead of Android location
+- Refactored sensor aggregators
diff --git a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
index 7777d2fdb..9f6170067 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
@@ -705,7 +705,7 @@ public class PreferencesUtils {
     public static TrackFileFormat getExportTrackFileFormat() {
         final String TRACKFILEFORMAT_NAME_DEFAULT = getString(R.string.export_trackfileformat_default, null);
         String trackFileFormatName = getString(R.string.export_trackfileformat_key, TRACKFILEFORMAT_NAME_DEFAULT);
-        return Arrays.stream(TrackFileFormat.values())
+    return Arrays.stream(TrackFileFormat.values())
                 .filter(format -> format.getPreferenceId().equals(trackFileFormatName))
                 .findFirst().orElse(TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES);
     }