I have a girl, Gracie Ruth 1 yr old and her brother Yogi 6 mo old and they are great together. I will say that sometimes their 'play fighting' sounds serious, but when I look over at them they aren't even touching, just laying facing each other making horrible noises. Then again sometimes it's full contact but, again, even though they are make horrible noises it's very obvious they are only playing. When the occasional yip does happen, they get told to Quit! and they are right back to playing after a sniff or two to be sure no one has hurt feelings.
As long as they know who the true leader is - that would be you

- then there shouldn't be too much trouble. Just watch that the puppy doesn't bully the older one too much. Puppies just have soooo much energy. And that the older one doesn't dictate when the puppy can come around you.
Good luck....and post some pictures!!