diff --git a/crystfel/build b/crystfel/build
index 7472355..0512977 100755
--- a/crystfel/build
+++ b/crystfel/build
@@ -7,13 +7,25 @@
 # could be pip3 install --user meson
 # cd lines can be deleted with compile_in_sourcetree being true
 pbuild::configure() {
+<<<<<<< HEAD
+=======
+    cd "${SRC_DIR}"
+>>>>>>> fc35801 (use local meson, need to pip install meson > 0.60 at home folder)
     ~/.local/bin/meson setup build --prefix="${PREFIX}"
 }
 
 pbuild::compile() {
+<<<<<<< HEAD
+=======
+    cd "${SRC_DIR}"
+>>>>>>> fc35801 (use local meson, need to pip install meson > 0.60 at home folder)
     ~/.local/bin/meson compile -C build
 }
 
 pbuild::install() {
+<<<<<<< HEAD
+=======
+    cd "${SRC_DIR}"
+>>>>>>> fc35801 (use local meson, need to pip install meson > 0.60 at home folder)
     ~/.local/bin/meson install -C build
 }