ok, fuck it. This isn't working, and not needed at that
fixed merge conflict