diff --git a/readme.txt b/readme.txt
index ab129dd..3266dfc 100755
--- a/readme.txt
+++ b/readme.txt
@@ -3,12 +3,8 @@
 Contributors: cmanon, jrfoell, lancewillett, dlintott, sebastianerb
 Tags: strava, activity, bicycle, cycling, biking, running, run, swimming, swim, paddle, kayak, gps, shortcode, widget, plugin, block, blocks
 Requires at least: 4.6
-Tested up to: 5.8
-<<<<<<< HEAD
-Stable tag: 2.10.2-beta1
-=======
-Stable tag: 2.11.0
->>>>>>> @{-1}
+Tested up to: 5.9
+Stable tag: 2.12.0-beta2
 Requires PHP: 5.3
 License: GPLv2 or later
 
@@ -138,7 +134,7 @@ On the WP-Strava settings page you cannot currently remove and add another athle
 
 == Changelog ==
 
-= 2.12.0-beta1 =
+= 2.12.0-beta2 =
 Added debugging for API POST to troubleshoot 401 errors https://wordpress.org/support/topic/wp-strava-error-401-unauthorized/
 
 = 2.11.0 =