correcting merge errors