Correction of the last merge