Fix duplicated rebase conflicts code