login, save steps on the server
Merge remote-tracking branch 'origin/master'
login , server