commiting and pushing a change to master to hopefully make rebase work the way I think it's supposed to work