A question about boys before flowers?

in which episode of boys before flowers does jan di and jun pyo come together? i mean ji hoo wins right? so when does he let her go or whatever?