conflict in master
merge in gmailbranch
Merge branch 'master' into gmailbranch
again conflict in branch
2nd master conflict
resolving 1st conflict in master
merge conflict