fix: "Property X will overwrite the base property in Y" typescript error#26

GoogleFeud wants to merge 3 commits intodetritusjs:masterdetritusjs/client:masterfrom

GoogleFeud:masterCopy head branch name to clipboard