Merge branch 'origin/master'
1
Merge branch 'origin/functionA'