diff --git a/openlp/core/__init__.py b/openlp/core/__init__.py
index a750feb1f..18c5c6648 100644
--- a/openlp/core/__init__.py
+++ b/openlp/core/__init__.py
@@ -305,7 +305,7 @@ def main(args=None):
     Registry().register(u'openlp_core', app)
     app.setApplicationVersion(get_application_version()[u'version'])
     # Instance check
-    if app.isAlreadyRunning():
+    if app.is_already_running():
         sys.exit()
     # First time checks in settings
     if not Settings().value(u'general/has run wizard'):
@@ -322,6 +322,6 @@ def main(args=None):
     else:
         log.debug(u'Could not find default_translator.')
     if not options.no_error_form:
-        sys.excepthook = app.hookException
+        sys.excepthook = app.hook_exception
     sys.exit(app.run(qt_args))
 
diff --git a/openlp/core/ui/media/mediaplayer.py b/openlp/core/ui/media/mediaplayer.py
index 08909c013..61550acfc 100644
--- a/openlp/core/ui/media/mediaplayer.py
+++ b/openlp/core/ui/media/mediaplayer.py
@@ -26,14 +26,10 @@
 # with this program; if not, write to the Free Software Foundation, Inc., 59  #
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
-<<<<<<< TREE
-
-from openlp.core.lib import Registry
-=======
 """
 The :mod:`~openlp.core.ui.media.mediaplayer` module contains the MediaPlayer class.
 """
->>>>>>> MERGE-SOURCE
+from openlp.core.lib import Registry
 from openlp.core.ui.media import MediaState