add branch dev
add conflict
add a good
 add not a good
fix conflict