TestCommit2
"TestCommit1"
TestCommit2
Commit All
Master Branch Commit2
added a
Hotfix
Finished footer
conflict resolved
Merge remote-tracking branch 'ap/master'