Been marinating this one, are they together already?

And are the conflicts already solved?

kinda ??, i mean im not sure thier dating but i think the conflict is over right now