THE END OF CONFLICT happens when we make our will one with our Creator's Will. There is no conflict in the Universal Will of God. When we are "aligned" with that, no conflict can exist in us. Fear produces conflict and binds the world to conflict; forgiveness sets us free of it.
Forgiveness ends the dream of conflict in us. What brings a sense of "conflict" is a projection of fear, something that is not even there. in reality.
Forgiveness gives us the Gifts of God. Peace and joy, which forgiveness offers us, give us a state of being whose nature is consistent with God's Will. Lessons #331-#334 make these things clear.