diff --git a/programme.sh b/programme.sh
index cca4382..5f15461 100755
--- a/programme.sh
+++ b/programme.sh
@@ -12,6 +12,7 @@ else
 	rep="$1"
 fi
 
+<<<<<<< HEAD
 function buildProg()
 {
 	directory="$1"