You provided two different names, each representing collections of ideas and objectives that are extremely general and often nebulous or ambiguous, and you complained that someone is pursuing one to the detriment of the other.
No more is plain from the text you wrote.
I am asking you to offer further details over how you personally are understanding the particular terms, and perceiving the conflicts.