ut oh, I'm seeing this even after reverting any changes... did I break something with my merge commit?