Dan. As long as you have an equal amount of trouble makers vs. diplomats in a given unit, fighting will not take place. More trouble makers than diplomat is a problem and you can fix that by moving dudes around.
The_Ruiner's comments