online branch add a conflict
add a master conflict
resove the conflict