fix merge bugs
..