Hey-
I just merged it with master, but left it on renaming and pushed my changes.
Can you take a look and see if it looks sane?
I am not sure if it was you, but it looks like someone ran it thru a code formatter. It makes it really hard to merge when that type of thing is done.
We can't all be using different code formatters, so for now let's just not re-format each other's code. In a week or so we can decide what formatter to use and add it to the workflow.
LMK how it looks.
Alan