Alexander Belanger d19e330d9f fix more merge conflicts, compile issues 4 lat temu
..
env b5d78b2705 attempt to fix merge conflicts 4 lat temu
loader d19e330d9f fix more merge conflicts, compile issues 4 lat temu
config.go d19e330d9f fix more merge conflicts, compile issues 4 lat temu
metadata.go ee40d03659 fix import cycle 4 lat temu