Correcting merge error