diff --git a/l/LLVM/LLVM-7.0.0-intel-2017c.eb b/l/LLVM/LLVM-7.0.0-intel-2017c.eb
index 1344727a..b64790df 100644
--- a/l/LLVM/LLVM-7.0.0-intel-2017c.eb
+++ b/l/LLVM/LLVM-7.0.0-intel-2017c.eb
@@ -32,8 +32,12 @@ dependencies = [
 
 configopts = '-DBUILD_SHARED_LIBS=ON -DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS -shared-intel" '
 # required to install extra tools in bin/
+<<<<<<< HEAD
 configopts += "-DLLVM_INSTALL_UTILS=ON -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_ENABLE_ZLIB=ON -DLLVM_ENABLE_RTTI=1 "
 configopts += "-DCMAKE_BUILD_TYPE=Release "
+=======
+configopts += "-DLLVM_INSTALL_UTILS=ON -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_ENABLE_ZLIB=ON"
+>>>>>>> e97186d5e8c19eac774b0d280ee66d007903d67a
 
 sanity_check_paths = {
     'files': ['bin/llvm-ar', 'bin/FileCheck'],