working on line merging
..
..
fix line merging