Another tentative to fix the merge issue