commit new_branch_one_file1.txt to new_branch_one
modify new_branch_one_file1.txt to git
commit new_branch_one_file222222222.txt to git of new_branch_one
222222222222288888888888888889
9693399969699999
modify new_branch_one_file1.txt to git 55555555555
modify 123456.txt file to git of new_branch_one 891111111111111111
modfiy 123456.txt to git of new_branch_one  PPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPRRRRRRRRRRRRRRR
modify 888.txt to git of our_new_branch_one DDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEQQQQQQQQQQQQQQQQQWWWWWWWWWWWWW
Merge branch 'new_branch_one'

Conflicts:
	123456.txt
	888.txt