team 1 commit file
Merge branch 'team2' into test
team 1.txt add
Merge branch 'team1' into test
Merge branch 'team2' into test