form checkout local
Merge remote-tracking branch 'origin/master'
avatar save 0308