checkout-m -> conflict -> add -> merged summited