merge vs. rebase - is this the place to make a statement.  I'm partial to rebase at this step