Hi, can anyone please explain to me the difference between Tex-Mex and Tejano music?

My understanding is that Tejano is a more modern phenomenon mixing various musical styles, while Tex-Mex blends 'Mexican' music with country. Is that right? Also, where does Conjunto come into it? Thanks.