branch2 commit for conflict
added file during merge issue
Merge branch 'branch1_team'
fixed merge issues
Merge branch 'master' into branch2_team