diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index 3b1536469e3e6c0eae2dd568f41b09c68355b342..861e6f3e4e6ce6cb8350acbc80ebe5b22de104cf 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -165,7 +165,7 @@ class SSHConnection():
 			self.command('git checkout -f ' + self.eNBCommitID, '\$', 5)
 		# if the branch is not develop, then it is a merge request and we need to do 
 		# the potential merge. Note that merge conflicts should already been checked earlier
-		if self.eNBBranch != 'develop':
+		if (self.eNBBranch != 'develop') and (self.eNBBranch != 'origin/develop'):
 			self.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 5)
 		self.command('source oaienv', '\$', 5)
 		self.command('cd cmake_targets', '\$', 5)