fix conflicts with dasein-core