Change fps from 24 to 25

[blueeyes_]

I have one video with a frame rate of 24 and another video with a frame rate of 25 which makes their playback speeds different. I need to somehow convert one of the videos to match the other video's fps. I already figured out how to change the fps of the video itself but don't know how to change the audio as well.

Currently when I convert the video and set the fps to 25, the resulting video has the correct fps and the length of the video changes as well but the speed of the audio stays the same. If I tick the "keep original audio track" box, the audio buffers every couple seconds to stay with the speed of the video.