merge compiles now ... but does every module work? TODO: Test it.