Fix wrong merge conflict resolution (bug 1038985, bug 1039868)

See https://github.com/mozilla/fireplace/commit/57b14faa5b1bb97d4d37a846133bbdc67b680df0#commitcomment-7227864