Manual merge rebase conflicts.