fix bad conflict resolution in https://gerrit.wikimedia.org/r/#/c/181183/

Change-Id: I9aaf59fb9b1533f7b1efb21b7ea5edebc18896c0