Fix CondClauseError when using use_parent_field_for_type with matching types#138

mathieuprog merged 2 commits intomathieuprog:mastermathieuprog/polymorphic_embed:masterfrom

zacksiri:masterzacksiri/polymorphic_embed:masterCopy head branch name to clipboard