git pull --rebase origin master
git push -u origin master