resolved conflicts in: source/unres/src_MD/CMakeLists.txt