24 & 29.97 fps in one session

Hi- I'm need to create a FCP session in which my source material will be a mix of both 29.97 & 24 fps footage. I tried pulling down my 29.97 footage to 24 but it looks really jumpy expecially in shots where the camera pans. Is it better that I bump my 24 footage to 29.97? What's the best way to deal with 2 different frame rates i one project? Thanks.