swipe note
Merge remote-tracking branch 'origin'
note
Merge remote-tracking branch 'origin/master'