changes form rbanch_one
resolve conflict on file_1.txt
file_on_branch_on.txt
add line
Merge branch 'branch_one'
add file master 2