I have two threads, both from the same person, and for some reason, my iPhone has separated their text message/sms from their iMessages. Is there anyway to merge these two threads?
No. They are probably sending some to your phone number and some to your email. To keep them as one thread, they need to make sure they always use the same one.