Worked on the scala-native/scala-native repository to improve type handling in code generation, focusing on conditional expressions in Scala. Addressed a bug in the GenIf logic where return types involving Unit were incorrectly forced, particularly when only one branch was of type Unit. Simplified the type inference mechanism by using the tree’s type directly, which enhanced both correctness and maintainability of the generator code. Added regression tests to ensure proper handling of Scala 3 union types in conditional expressions. The work leveraged functional programming principles, Scala language features, and a strong emphasis on type safety to improve code reliability and clarity.