Merge the two Component sections
Add Substitution change