Not sure, but when I try to rebase master into your branch I get conflicts.

This is really strange. I have no problems to rebase master into my branch.