merge some conflict