Errors in ligne.h from previous merge...