test commit to use rebase on a normal (trivial merge) pull