merge error corrected2