fixed minor merge issue