got my fingers crossed

hopefully this will merge right
We can't merge a PR that contains... a merge conflict