Merge remote-tracking branch 'origin/branch1' into my-first-polymer
Merge remote-tracking branch 'origin/conflicting-branch1' into my-first-polymer
Merge remote-tracking branch 'origin/branch2' into my-first-polymer
Merge remote-tracking branch 'origin/branch3' into my-first-polymer