removed the merge issue