minor merge issue