USP requires water used in the manufacture of parenterals to be water for injection, WFI. Does Q7A conflict with this?

No. If you go back to the scope of Q7A, it clearly states that the sterilization and aseptic processing of sterile APIs are not covered by this guidance.