reproduction of erratique is ready
fix merges