diff --git a/README.md b/README.md
index ea55b378ee550b..4b48e071d8f641 100644
--- a/README.md
+++ b/README.md
@@ -3,21 +3,13 @@
 
 [![GitHub release](https://img.shields.io/github/release/mastodon/mastodon.svg)][releases]
 [![Build Status](https://img.shields.io/circleci/project/github/mastodon/mastodon.svg)][circleci]
-<<<<<<< HEAD
-[![Code Climate](https://img.shields.io/codeclimate/maintainability/tootsuite/mastodon.svg)][code_climate]
-=======
 [![Code Climate](https://img.shields.io/codeclimate/maintainability/mastodon/mastodon.svg)][code_climate]
->>>>>>> 8c7223f4eac80b5725485be742d3fa2c984f4670
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/mastodon/localized.svg)][crowdin]
 [![Docker Pulls](https://img.shields.io/docker/pulls/tootsuite/mastodon.svg)][docker]
 
 [releases]: https://github.com/mastodon/mastodon/releases
 [circleci]: https://circleci.com/gh/mastodon/mastodon
-<<<<<<< HEAD
-[code_climate]: https://codeclimate.com/github/tootsuite/mastodon
-=======
 [code_climate]: https://codeclimate.com/github/mastodon/mastodon
->>>>>>> 8c7223f4eac80b5725485be742d3fa2c984f4670
 [crowdin]: https://crowdin.com/project/mastodon
 [docker]: https://hub.docker.com/r/tootsuite/mastodon/