rebase-merge-test seems to go okay adding line 1 adding line 2x adding line 3x adding line 4 bla bla bla bla again and again