fixup! merge the two software