The phrase that could correctly substitute "patched up" in the given sentence is "resolved" or "reconciled."
For example: "...the white-skinned people of South Africa resolved their differences..." "...the white-skinned people of South Africa reconciled their differences..."
