add test2 2
add test 1
Merge branch 'merge_change_same_file_2' into merge_change_same_file_1
Merge pull request #9 from cumga007/merge_change_same_file_1

Merge change same file 1