Team 2 release
Merge conflicts master and team2 solved
Team 2 ready release
Merging team1 and master, conflicts solved
Second release
Testing git commit -a -m
Ooops...