diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py
index fa97d8f3e1..35ef4005de 100644
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -38,10 +38,6 @@ import os
 import time
 from multiprocessing import Process, Lock, SimpleQueue
 import yaml
-<<<<<<< HEAD
-
-=======
->>>>>>> 90c6b8b58b... copyout workaround
 
 #-----------------------------------------------------------
 # OAI Testing modules