Fix merge problem

Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>