Added --ff-only --all to git pull
Merge remote-tracking branch 'origin/master'
Merged desktop