Added the rebase vs. merge link