A note on the word "yoga".
Yoga has two different meanings - a general meaning and a technical meaning.
The general meaning is the joining together or union of any two or more things. The technical meaning is "a state of stability and peace and the means or practices which lead to that state." The Bhagavad Gita uses the word with both meanings.