Added support for the ParentFix branch in the compiler
merged `parentFix` into Redefinition