Fix conflict after rebase