Fix a minor merge issue