The two aren't mutually exclusive.
In any event, given that conservatives these days are quick to drop any adherence to free markets and individual liberties in favor of reactionary identity politics, I would say that the distinction between the different flavors of "liberal" are gradually being eroded.