Hi Mandaleigh,
Sounds like you are on the right track in combining your flocks.
Whenever I have to do this I house them next to each other for a few weeks.
Then I let everybody free range during the day together. That way they can get away if there is a problem and nobody gets hurt (just lots of noise).
Then finally I let them go to sleep together.
Just a suggestion. It has worked for me.
PS. Going prickly pear fruit hunting with my hubby this evening!!
Can't wait to make some of your jelly.
Diane in Boerne