branch2 commit for conflict
branch3 commit for conflict
Merge branch 'branch1_team'
fixed merge issues
Merge commit 'f90067a54b5234027834a96b4f8616a911eda5bd' into HEAD