Greater Gods does conflict with CBM if I recall correctly. CBM1.6 is really close to the vanilla game in terms of content. The later versions have EDM included along with some new nationals. Current development of CBM is basically at the forums over
here