.
.
.
Merge origin/master
.
.
.
Merge origin/master