Fixed a bug in merge resumption
Updated CMakeLists.txt to use test_repo as assumed test repo name