diff --git a/CLAPACK/Makefile b/CLAPACK/Makefile
index d64dafc1b..604097af7 100644
--- a/CLAPACK/Makefile
+++ b/CLAPACK/Makefile
@@ -25,7 +25,6 @@ $(SRC)/lapack_WA.bc:  $(SRC)/Makefile
 $(SRC)/Makefile:
 	wget -q -O clapack.tgz http://www.netlib.org/clapack/clapack.tgz
 	md5sum --quiet --check checksums || (rm -f clapack.tgz; false)
-
 	tar xzf clapack.tgz
 	rm -rf $(SRC)
 	mv CLAPACK-$(CLAPACK_VERSION) $(SRC)
diff --git a/Makefile b/Makefile
index 42ed9f239..c128e6f66 100644
--- a/Makefile
+++ b/Makefile
@@ -64,11 +64,7 @@ all: build/pyodide.asm.js \
 
 build/pyodide.asm.js: src/main.bc src/jsimport.bc src/jsproxy.bc src/js2python.bc \
 		src/pyimport.bc src/pyproxy.bc src/python2js.bc \
-<<<<<<< HEAD
 		src/runpython.bc src/hiwire.bc
-=======
-		src/runpython.bc src/hiwire.bc $(CLAPACK)
->>>>>>> Move CLAPACK_WA to the root folder
 	[ -d build ] || mkdir build
 	$(CXX) -s EXPORT_NAME="'pyodide'" -o build/pyodide.asm.html $(filter %.bc,$^) \
 	  $(LDFLAGS) -s FORCE_FILESYSTEM=1
@@ -214,14 +210,10 @@ $(LZ4LIB):
 $(SIX_LIBS): $(CPYTHONLIB)
 	make -C six
 
+
 $(CLAPACK): $(CPYTHONLIB)
-	# We build BLAS/LAPACK only for target.
-	# On host we include -LCLAPACK-WA path which has no effect on host.
-	# On target it gets rewritten by pywasmcross to the full patch of
-	# blas_WA.bc, lapack_WA.bc which are linked statically in scipy
-	# in each module that needs them.
-	make -C CLAPACK-WA/F2CLIBS/libf2c arith.h
-	emmake make -C CLAPACK-WA/
+	make -C CLAPACK
+
 
 $(CLAPACK): $(CPYTHONLIB)
 	make -C CLAPACK