adding new answer to another question
Merge remote-tracking branch 'origin/master'