Corrected Merge issue