cleaning up last merge issue