1.) bugBranch
2.) bugBranch
4.) master
5.) quick bug fix
7.) master
Merged conflicts when merging branch master and bug-quic-fix