P-Square: Nigerian Afrobeats twins make up after years of feuding