In pali, Lola means agitate.
Example, I agitated between doing good to a robber or doing bad to a robber.
From PTS Pali-English dictionary entry on lola:
Lola (Loḷa) Lola (Loḷa) (adj.) [fr. luḷ: see ...
You are correct.
The concept of conflict (or clash or mismatch) is subsumed under the concept of dukkha or dukkhata.
If you think about it, there's no suffering distinct from (apart from) conflict. ...