merge changes from to local to server code example

Example: git merge

$ git checkout master
Switched to branch 'master'
$ git merge iss53