Fix conflicts from rebase