Skill used to resolve a conflict (4)
I believe the answer is:
tact
(Other definitions for tact that I've seen before include "Sensitivity in dealing with people" , "Diplomatic sensitivity" , "Consideration and sensitivity" , "Diplomatic skill" , "Sensitivity (in dealing with others)" .)