diff --git a/src/score.rs b/src/score.rs
index 49765ee4ea..1437e16c02 100644
--- a/src/score.rs
+++ b/src/score.rs
@@ -10,7 +10,11 @@
 // License for the specific language governing permissions and limitations
 // under the License.
 #![allow(clippy::derive_partial_eq_without_eq)]
+<<<<<<< HEAD
 #![allow(clippy::non_canonical_partial_ord_impl)]
+=======
+#![allow(clippy::incorrect_partial_ord_impl_on_ord_type)]
+>>>>>>> 651409f (Fix build errors with Rust 1.73.0 (#996))
 
 use std::cmp::Ordering;
 use std::ops::{Add, AddAssign};