Fix merge conflict [skip ci]