first commit from team two
commiting new files
commiting changed files
pointless changes to show extra commits
added lines to the index to review conflicts
extra content, merge is not happening
merged with master, conflicts resolve via IDE
Merge branch 't2_branch1'

Final merge