fix merge && constructor