Correct merge issue