diff --git a/limitSetting/limitSetting.py b/limitSetting/limitSetting.py
index 369c11f9c3048eb1d5a6c721cbb5d0af39b3bb36..a911a37a9faa98c02b40ce81418417d3c224c26d 100644
--- a/limitSetting/limitSetting.py
+++ b/limitSetting/limitSetting.py
@@ -1128,11 +1128,7 @@ if __name__ == '__main__':
             #                                     expectedLimitsGraph_1Sigma, expectedLimitsGraph_2Sigma , colorScheme = ROOT.kRed , writeTo = writeTFile)
 
 
-<<<<<<< limitSetting/limitSetting.py
     writeLimitsToCSV( {"lowLimit2Sigma" : lowLimits2SigDict, "lowLimit1Sigma" : lowLimits1SigDict, "bestEstimate" : bestEstimateDict, "expectedLimit": expectedLimitDict, "upperLimit1Sigma" : upperLimits1SigDict , "upperLimit2Sigma" : upperLimits2SigDict } )
-=======
-    writeLimitsToCSV( {"lowLimit2Sigma" : lowLimits2SigDict, "lowLimit1Sigma" : lowLimits1SigDict, "bestEstimate" : bestEstimateDict, "expectedLimit": expectedLimitDict "upperLimit1Sigma" : upperLimits1SigDict , "upperLimit2Sigma" : upperLimits2SigDict } )
->>>>>>> limitSetting/limitSetting.py
 
 
     ###############################################