Merge with remote
Merge branch 'origin/master'