Better check for if a set exists
Merge remote-tracking branch 'origin/master'