Fix deep merge issue