Fix merge conflict

CREDITS.TXT

LICENSE.TXT

README.md

hpvm/CMakeLists.txt

hpvm/include/BuildDFG/BuildDFG.h

hpvm/include/GenHPVM/GenHPVM.h

hpvm/include/SupportHPVM/DFG2LLVM.h

hpvm/include/SupportHPVM/HPVMUtils.h

hpvm/install.sh

hpvm/lib/Transforms/BuildDFG/BuildDFG.cpp

hpvm/lib/Transforms/ClearDFG/ClearDFG.cpp

hpvm/lib/Transforms/DFG2LLVM_CPU/DFG2LLVM_CPU.cpp

hpvm/lib/Transforms/DFG2LLVM_OpenCL/DFG2LLVM_OpenCL.cpp

hpvm/lib/Transforms/GenHPVM/GenHPVM.cpp

hpvm/lib/Transforms/LocalMem/LocalMem.cpp

hpvm/projects/hpvm-rt/hpvm-rt.cpp

hpvm/projects/hpvm-rt/hpvm-rt.h

hpvm/projects/hpvm-rt/policy.h

hpvm/scripts/automated_tests.sh

hpvm/scripts/llvm_installer.sh