[development country_testcase] Resolved Merge conflict