God’s Commitment Includes Discipline and Mercy