correcting merge