diff --git a/start.sh b/start.sh
index 9aa567f..fe48ddb 100644
--- a/start.sh
+++ b/start.sh
@@ -11,4 +11,7 @@ mkdir /opt/meshviewer/build/data
 mkdir /opt/meshviewer/build/data/tdf4
 mkdir /opt/meshviewer/build/data/tdf5
 mkdir /opt/meshviewer/build/data/tdf6
+<<<<<<< HEAD
 mkdir /opt/meshviewer/build/data/tdf7
+=======
+>>>>>>> 500376bbc36fb4b937355647fdbecb3e2a41db66