Deal ends rift over wilderness land