I would take kim's advice here, they usually seem to work things out one way or another, as long as neither are getting hurt badly then they should be fine, it took a while for my two to work it out, and they have, what we say an understanding, Ash is boss cat and that is that, Lexie keeps her distance and does not bother him, he used to swipe her now and then but rarely bothers these days and they touch each others noses, which I am sure is a good sign, so they have accepted each other, which I am sure your two will in time, and they will work out who is boss, don't be suprised if it is the kitten, lol, good luck and be patient, I am certain all will be just fine.