Fix git merge error on testcase import path