corrected merge issue