Resolve dispute (6)
I believe the answer is:
settle
(Other definitions for settle that I've seen before include "Fix; reside" , "Resolve; land" , "Come to rest -- North Yorkshire market town" , "Finish fidgeting" , "Resolve or reach an agreement" .)