Are Cody and Bailey going to make up?

hopefully if they, because if they don't Bailey has no reason to be on the show