From 15a1d576ac009f52fbcf06ca9e414e93c31480b4 Mon Sep 17 00:00:00 2001
From: morpheus65535 <5130500+morpheus65535@users.noreply.github.com>
Date: Mon, 15 Jan 2018 23:29:15 -0500
Subject: [PATCH] Updating process improvement

---
 check_update.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/check_update.py b/check_update.py
index fb8005478..00e447960 100644
--- a/check_update.py
+++ b/check_update.py
@@ -29,7 +29,7 @@ def check_and_apply_update():
     result = g.pull('origin', branch)
     if result.startswith('Already'):
         logging.info('No new version of Bazarr available.')
-    elif result.startswith('Updating'):
+    elif result.startswith('Updating') or result.startswith('Merge made'):
         logging.info('Bazarr updated to latest version and need to be restarted.')
         updated()
     else: