In the Bible I have learned that "fight" can have a different meaning. It can mean standing up for what is right as in the Christian songs "Stand Up, Stand Up for Jesus" and "Onward, Christian Soliders".
While God tells us to be kind, it is also important to know when a fight is warranted. We should never give in to make someone happy if it is at the expense of God's word. The OLd Testament has many instances when fights and battles were done at God's direction.
In today's world we may be faced with many fighting instances. We need to be sure our battle is God's battle and not our personal fight. Then we can be confident that right is on our side.