diff --git a/platformcode/updater.py b/platformcode/updater.py
index 7da7e6e6..daca1df3 100644
--- a/platformcode/updater.py
+++ b/platformcode/updater.py
@@ -73,6 +73,9 @@ def check_addon_init():
         for c in reversed(commits[:pos]):
             commit = httptools.downloadpage(c['url']).data
             commitJson = json.loads(commit)
+            # evitiamo di applicare i merge commit
+            if 'Merge branch' in commitJson['commit']['message']:
+                continue
             logger.info('aggiornando a' + commitJson['sha'])
             alreadyApplied = True