vbfischer/test-rebase-hotfix

SOmething to test rebasing strategies