'commit to server' is work
Merge remote-tracking branch 'origin/master'