fix of a syntax error produced by the automatic merging