Fixing the rebase conflicts.