Merge conflict fix

Merge conflict fix.

@Benglin, please, take a look