Here's a sneak peek from Conan (Robert Kirkman is the guest) -

[[1]]

I'm assuming this may lead into the fight as shown in the promo... Like others, it seems likely to be Merle and Glenn, or hell even Michonne - right now though, just watching this sneak peek makes me wonder how an argument like this (coming from Merle) could lead into a rumble.