feature1 add conflict solve
add a third commit
solve conflict