master 3333 comment
Commiting master 4444444
Commiting master 555555
merging master into dev
Resolving conflicts in dev2