had a minor merge issue