Don't really know what I broke with the merge, but it killed everything.
Rebooting everything back to normal now.