Hi Jason,

Could you please stop rebasing the master branch of the git repository?
It's really annoying (and possibly confusing) to obtain merge conflicts
while simply pulling the latest changes.

If you want to rebase, please use feature branches or something similar.

Thanks,
Baptiste