Historic reconciliation ends decades-long feud