Merge conflict fixed
Add file test-mc.cpp