added a new file ahead on master branch
and now moving it a bit more forward
ok now we test rebasing, adding a little more
please merge conflict here we add some more stuff to move our test branch forward, one more spot - can we make a merge conflict just with this
x = 10 + 5