solve conflicts, and adapt LorentzClass methods to be similar to what Vanya did with Vector3D
solve conflicts, and adapt LorentzClass methods to be similar to what Vanya did with Vector3D

scikit-hep/scikit-hep