git study init ver
step 2
branch +2
fix conflict