diff --git a/.aux/test_with_lcg b/.aux/test_with_lcg
index 8613620f..c0453c77 100755
--- a/.aux/test_with_lcg
+++ b/.aux/test_with_lcg
@@ -6,12 +6,3 @@ source /cvmfs/sft.cern.ch/lcg/views/${LCG}/${CMTCONFIG}/setup.sh
 source build/INSTALL/thisostap.sh 
 cd build 
 ctest -N  && cmake .. -DCMAKE_INSTALL_PREFIX=./INSTALL/ && ctest -j2 -R '(histos_param|roostat)' --output-on-failure --test-output-size-failed 5000000
-=======
-#!/usr/bin/env bash
-LCG=$1
-CMTCONFIG=$2
-source /cvmfs/sft.cern.ch/lcg/views/${LCG}/${CMTCONFIG}/setup.sh
-source build/INSTALL/thisostap.sh 
-cd build 
-ctest -N  && cmake .. -DCMAKE_INSTALL_PREFIX=./INSTALL/ && ctest -j2 --output-on-failure --test-output-size-failed 5000000
->>>>>>> Stashed changes