Fix up invalid master merges

beets/autotag/mb.py

@@ -18,8 +18,6 @@
 import musicbrainzngs
 import re
 import traceback
-from collections import Counter
-from six.moves.urllib.parse import urljoin
 
 from beets import logging
 from beets import plugins

beetsplug/albumtypes.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # This file is part of beets.
 # Copyright 2021, Edgars Supe.
 #
@@ -16,7 +14,6 @@
 
 """Adds an album template field for formatted album types."""
 
-from __future__ import division, absolute_import, print_function
 
 from beets.autotag.mb import VARIOUS_ARTISTS_ID
 from beets.library import Album

docs/changelog.rst

@@ -7,13 +7,6 @@ Changelog
 This release now requires Python 3.6 or later (it removes support for Python
 2.7, 3.4, and 3.5).
 
-* Primary and secondary release types from MusicBrainz are now stored in
-  ``albumtypes`` field. Thanks to :user:`edgars-supe`.
-  :bug:`2200`
-
-* :doc:`/plugins/albumtypes`: An accompanying plugin for formatting
-  ``albumtypes``. Thanks to :user:`edgars-supe`.
-
 For packagers:
 
 * We fixed a flaky test, named `test_album_art` in the `test_zero.py` file,

test/test_albumtypes.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # This file is part of beets.
 # Copyright 2021, Edgars Supe.
 #
@@ -15,7 +14,6 @@
 
 """Tests for the 'albumtypes' plugin."""
 
-from __future__ import division, absolute_import, print_function
 
 import unittest