fix a typo from merging and scope of enum struct fields