A less OO style seems more manageable here.
Merge remote-tracking branch 'origin/master'