fix merge test case
1 file changed