diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 6ff79acf2..048a1a80f 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,11 +13,7 @@ module Mastodon
     end
 
     def patch
-<<<<<<< HEAD
-      5
-=======
       0
->>>>>>> v3.2.0rc1
     end
 
     def flags