NaCC approves Trafigura, Puma Energy merger