It will all melt together. The propolis is already often mixed with the wax, by the bees, where they make attachments. The resulting wax will make stronger foundation.
I just sort the wax as you go. Keep the clean white cappings and the clean white comb in one pile and the old brood comb and the propolis and burr comb in another.