(fix)conflict in test.txt

There are many rebased commits in this thing... looks linear to me