If Victor knows French then yes there is not conflict unless you count his crush as one, but if he doesn't know French then the conflict is still there because he still has to help Teresa on knowledge he doesn't know himself.
Answer:
Victor's conflict isn't fully resolved unless he studies and learns French. He only spoke a little in class to impress Teresa. If he doesn't study, then later on Teresa might find out Victor does not know French.
(I'm so sorry if it's wrong)
Hope this helps!