Fix mis-merge issue