Correcting merge issue