diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh
index 1677e99c..d80225d0 100755
--- a/debian/qualify-clang.sh
+++ b/debian/qualify-clang.sh
@@ -49,6 +49,7 @@ void test() {
 }
 '> foo.c
 
+# Ignore if gcc isn't available
 scan-build-$VERSION -o scan-build gcc -c foo.c &> /dev/null || true
 scan-build-$VERSION -o scan-build clang-$VERSION -c foo.c &> /dev/null
 scan-build-$VERSION --exclude non-existing/ --exclude /tmp/ -v clang-$VERSION -c foo.c &> /dev/null
@@ -57,9 +58,7 @@ if ! grep -q -E "scan-build: 0 bugs found." foo.log; then
     echo "scan-build --exclude didn't ignore the defect"
     exit 42
 fi
-=======
 rm -rf scan-build
->>>>>>> origin/7
 
 rm -f foo.log
 echo 'int main() {return 0;}' > foo.c
diff --git a/debian/rules b/debian/rules
index 4ecb4770..e39b920b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -678,7 +678,7 @@ endif
 # 	dh_strip -p liblld-$(LLVM_VERSION) --dbg-package=liblld-$(LLVM_VERSION)-dbg
 # endif
 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' binutils) ge 2.28 ; echo $$?),0)
-	rm -f ($CURDIR)/libc++-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/*/operations.cpp.o
+	rm -f $(CURDIR)/libc++-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/*/operations.cpp.o
 # strip segfaults on libFuzzer.a
 	dh_strip -a -v -XlibFuzzer.a -Xlibc++.a -Xlibc++abi.a -Xlibc++experimental.a
 else