fixup! fixup! merge the two software