; and (B) such other official of the Department to serve as the acting head of a component, in the event that the head of a component vacates the position, in a manner that requires such official to have served for at least 90 days prior to such designation in the Senior Executive Service. . 103. Resolution of intra-departmental disputes Insert at the end of section 103 of the Homeland Security Act the following: (h) Intra-Departmental disputes On behalf of the Secretary, the Deputy Secretary shall have authority to resolve any intra-Departmental disputes that may arise between two or more components where one component is under the purview of the Associate Secretary. The Associate Secretary may appeal a resolution issued by the Deputy Secretary to the Secretary. . 104. Office of Strategy, Policy, and Plans (a) In general Section 709 of the Homeland Security Act of 2002 ( 6 U.S.C. 349 ) is amended— (1) in subsection (a), by adding at the end the following: The Office of Strategy, Policy, and Plans shall include an Assistant Secretary for International Affairs and at least five assistant secretaries within the Office of Strategy, Policy, and Plans with divided responsibility for the following areas: (i) Strategy. (ii) Threat prevention, including targeted violence. (iii) Integration. (iv) Border. (v) Immigration, including immigration statistics. (vi) Cybersecurity and infrastructure security. (vii) Screening and vetting, including biometrics. (viii) Law enforcement. (ix) Foreign investment and trade. ; (2) in subsection (c)(1), by inserting , including for activities that cross multiple Department components before the semicolon at the end; (3) in subsection (c)(6), by inserting , including feedback from organizations representing the needs of children, after stakeholder feedback ; (4) by redesignating subsections (e) through (g) as subsections (f) through (h), respectively