reset A
add file_a
add file_b_2
Merge branch 'new_branch'