Resolving Conflicts with MPQC/CMakeLists.txt