check conflict2 case
 merger