and make peace between conflicting