diff --git a/libraries/tock-register-interface/src/registers.rs b/libraries/tock-register-interface/src/registers.rs
index e2cf83bc64..b4fca27baf 100644
--- a/libraries/tock-register-interface/src/registers.rs
+++ b/libraries/tock-register-interface/src/registers.rs
@@ -141,7 +141,6 @@ impl<T: UIntLike, R: RegisterLongName> Writeable for WriteOnly<T, R> {
 /// type parameters `R` and `W` are identical, in which case a
 /// [`ReadWrite`] register might be a better choice).
 // To successfully alias this structure onto hardware registers in memory, this
-<<<<<<< HEAD
 // struct must be exactly the size of the `T` and is thus marked
 // `repr(transparent)` over an `UnsafeCell<T>`, which itself is
 // `repr(transparent)` over `T`.
@@ -150,9 +149,7 @@ impl<T: UIntLike, R: RegisterLongName> Writeable for WriteOnly<T, R> {
 // casting a pointer to a larger struct that containts this type). As such, it
 // does not have a public constructor and Rust thinks it's dead code and should
 // be removed. We `allow(dead_code)` here to suppress this warning.
-=======
 // struct must be exactly the size of the `T`.
->>>>>>> 2a512f5bf (no more warnings)
 #[allow(dead_code)]
 #[repr(transparent)]
 pub struct Aliased<T: UIntLike, R: RegisterLongName = (), W: RegisterLongName = ()> {