diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 4c670a8cd..96af2e733 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -33,11 +33,7 @@ module Mastodon
     end
 
     def repository
-<<<<<<< HEAD
-      ENV.fetch('GITHUB_REPOSITORY') { 'yingziwu/mastodon' }
-=======
-      ENV.fetch('GITHUB_REPOSITORY', 'mastodon/mastodon')
->>>>>>> upstream/main
+      ENV.fetch('GITHUB_REPOSITORY', 'yingziwu/mastodon')
     end
 
     def source_base_url