removed a merge marker
removed a merge marker


Former-commit-id: b519f9a21c14f3dac18fd6597ce38113d732e656 [formerly 6e979407af6457f824af63323e60e61a88bba402]
Former-commit-id: 3551f2e53cab5268045164eb44ae113e8e49ebac
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine