Fix small merge issue