I believe there'll still be just the two tribes. In one preview there was a shot of two yellow rafts, and another showed a shot with two red rafts and a yellow. There's most likely four rafts in the water, just none of the previews show them all at once.