end decades-old conflict