Fix duplication after rebase