corrected a merge error