Guardiola and De Bruyne Resolve Tension After Substitution Dispute