Seems to work for harmless input.

Barely tested, but kind of works.
Merge remote-tracking branch 'origin/master'