Fix merge fault from rebase