add test_file in branch dev
dev_1:change file
dev_2: change file
dev_2: change file #2
dev_1:change file #2
dev_1: Confict resolved
Merge branch 'dev'