There are two passages I think are worth looking at together:
Matthew 5:9 and Matthew 18:15.
Make peace and let your light shine.
Count it all grace.
Blessed are the peacemakers.
Making peace sometimes clashes with keeping the peace.
Awareness of the differences is a holy gift.