ok
Merge remote-tracking branch 'origin/master'
news picture changed
Merge remote-tracking branch 'origin'