random type inference fixes
fix merge conflicts