diff --git a/build-project.sh b/build-project.sh
index 949b9be..c7587af 100755
--- a/build-project.sh
+++ b/build-project.sh
@@ -1,7 +1,14 @@
 clear
+<<<<<<< HEAD
 ceedling test:all
 cd src/
 gcc main.c createCustomer.c -o prog
 ./prog
 rm prog
 cd ..
+=======
+cd src/
+gcc main.c
+./a.out
+rm a.out
+>>>>>>> 38af5af (build script)