fixes after conflicts

src/bitmessagekivy/mpybit.py

@@ -49,7 +49,6 @@ from kivymd.navigationdrawer import (
     MDNavigationDrawer,
     NavigationDrawerHeaderBase)
 from kivymd.selectioncontrols import MDCheckbox
-from kivymd.textfields import MDTextField
 from kivymd.theming import ThemeManager
 import queues
 from semaphores import kivyuisignaler
@@ -1398,7 +1397,7 @@ class NavigationDrawerTwoLineListItem(
     def _update_specific_text_color(self, instance, value):
         pass
 
-    def _set_active(self, active, list):        # pylint: disable=redefined-builtin
+    def _set_active(self, active, list_):
         pass
 
 

src/messagetypes/vote.py

@@ -7,8 +7,6 @@ from messagetypes import MsgBase
 # pylint: disable=attribute-defined-outside-init
 
 
-
-
 class Vote(MsgBase):
     """Module used to vote"""
 

src/pyelliptic/openssl.py

@@ -22,8 +22,6 @@ src/pyelliptic/openssl.py
 # pylint: disable=protected-access
 
 
-
-
 class CipherName:
     """Class returns cipher name, pointer and blocksize"""