typos + added the no-ff case for the (non-rebase) merge