diff --git a/pyheos/__init__.py b/pyheos/__init__.py
index b4cc5d6..6c48383 100644
--- a/pyheos/__init__.py
+++ b/pyheos/__init__.py
@@ -1,14 +1,8 @@
 """pyheos - a library for interacting with HEOS devices."""
-
 from . import const
 from .dispatch import Dispatcher
 from .heos import Heos
 from .player import HeosNowPlayingMedia, HeosPlayer
-<<<<<<< HEAD
-from .response import CommandError
-from .source import HeosSource, InputSource
-=======
->>>>>>> Lint
 from .response import CommandError
 from .source import HeosSource, InputSource