add the dev branch
test the dev branch conflict
add the test case conflict
fix the conflict