I don't recall which commit it was exactly. It's one of these: https://github.com/gem/oq-engine/pull/985/commits

You can reproduce the conflict by checking merging 875935dde76c4589b0b87aa5fa8a3fe1aef732b7 into d5dc2c1c275d3b640b8f6d09b81bfbda3a2e390e

<pre>
$ git checkout d5dc2c1c275d3b640b8f6d09b81bfbda3a2e390e
$ git merge 875935dde76c4589b0b87aa5fa8a3fe1aef732b7
</pre>