Liner Visu
fix merge