add test file for conflict
Merge branch 'new_branch'