Merge remote branches 'origin' and 'origin/master'