diff --git a/crates/re_types/source_hash.txt b/crates/re_types/source_hash.txt
index 6fb1cfa59b1b9..a7f6b3a6ef16d 100644
--- a/crates/re_types/source_hash.txt
+++ b/crates/re_types/source_hash.txt
@@ -1,114 +1,4 @@
 # This is a sha256 hash for all direct and indirect dependencies of this crate's build script.
 # It can be safely removed at anytime to force the build script to run again.
 # Check out build.rs to see how it's computed.
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-2d611d0d686a6314da94b1797472e7690413465d16a611aae3560a847668d53d
-||||||| parent of 5d0acef1a (fixing typo in re_types_builder doc)
-||||||| parent of 1177724fc (regen post rebase)
-=======
-<<<<<<< HEAD
->>>>>>> 1177724fc (regen post rebase)
-||||||| parent of 05ae674ef (tests and extensions for components.ClassId)
-=======
-<<<<<<< HEAD
->>>>>>> 05ae674ef (tests and extensions for components.ClassId)
-||||||| parent of d4eaa96d2 (tests and extensions for components.Color)
-=======
-<<<<<<< HEAD
->>>>>>> d4eaa96d2 (tests and extensions for components.Color)
-||||||| parent of 2dccfce77 (ignore weird inheritance lint -- whatever)
-=======
-<<<<<<< HEAD
->>>>>>> 2dccfce77 (ignore weird inheritance lint -- whatever)
-400c988b3f50d5081c883356351d7e6506b47a96409777441d05e5efa5e00239
-<<<<<<< HEAD
-=======
-400c988b3f50d5081c883356351d7e6506b47a96409777441d05e5efa5e00239
->>>>>>> 5d0acef1a (fixing typo in re_types_builder doc)
-||||||| parent of 682763a3c (autogenerated rust code)
-=======
-||||||| parent of 63fb6ac9a (autogenerated rust code)
-=======
-# This is a sha256 hash for all direct and indirect dependencies of this crate's build script.
-# It can be safely removed at anytime to force the build script to run again.
-# Check out build.rs to see how it's computed.
-a7f3c6f6e29d897104debea55952dca83bc273d4f45654f97102e9e22b9f3741
->>>>>>> 63fb6ac9a (autogenerated rust code)
-<<<<<<< HEAD
->>>>>>> 682763a3c (autogenerated rust code)
-||||||| parent of 1177724fc (regen post rebase)
-=======
-||||||| parent of 5e6f3f0cb (regen post rebase)
-a7f3c6f6e29d897104debea55952dca83bc273d4f45654f97102e9e22b9f3741
-=======
-3537a9f15a0ad721739c6e8a2acdf69664970a788761f6d6d7f3d5734090569b
->>>>>>> 5e6f3f0cb (regen post rebase)
-<<<<<<< HEAD
->>>>>>> 1177724fc (regen post rebase)
-||||||| parent of 05ae674ef (tests and extensions for components.ClassId)
-=======
-||||||| parent of 810148af0 (tests and extensions for components.ClassId)
-3537a9f15a0ad721739c6e8a2acdf69664970a788761f6d6d7f3d5734090569b
-=======
-9e8a5d753d77ccd044b75302ff9c0e72a49de37d33f079cd2eff714bd1646c48
->>>>>>> 810148af0 (tests and extensions for components.ClassId)
-<<<<<<< HEAD
->>>>>>> 05ae674ef (tests and extensions for components.ClassId)
-||||||| parent of d4eaa96d2 (tests and extensions for components.Color)
-=======
-||||||| parent of fb85bae28 (tests and extensions for components.Color)
-9e8a5d753d77ccd044b75302ff9c0e72a49de37d33f079cd2eff714bd1646c48
-=======
-359893dcaa82cbfbd23f1084a2a8e34bb306f1bd6b21d3d0f0b5c04be232f763
->>>>>>> fb85bae28 (tests and extensions for components.Color)
-<<<<<<< HEAD
->>>>>>> d4eaa96d2 (tests and extensions for components.Color)
-||||||| parent of 2dccfce77 (ignore weird inheritance lint -- whatever)
-=======
-||||||| parent of b90647911 (ignore weird inheritance lint -- whatever)
-359893dcaa82cbfbd23f1084a2a8e34bb306f1bd6b21d3d0f0b5c04be232f763
-=======
-4ae0169c023baf6a9f00ef2e3d23ca1886ec324f7a7f7c10071095b4e5976e38
->>>>>>> b90647911 (ignore weird inheritance lint -- whatever)
->>>>>>> 2dccfce77 (ignore weird inheritance lint -- whatever)
-||||||| parent of 51553d666 (regen post rebase)
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-400c988b3f50d5081c883356351d7e6506b47a96409777441d05e5efa5e00239
-||||||| parent of 63fb6ac9a (autogenerated rust code)
-=======
-# This is a sha256 hash for all direct and indirect dependencies of this crate's build script.
-# It can be safely removed at anytime to force the build script to run again.
-# Check out build.rs to see how it's computed.
-a7f3c6f6e29d897104debea55952dca83bc273d4f45654f97102e9e22b9f3741
->>>>>>> 63fb6ac9a (autogenerated rust code)
-||||||| parent of 5e6f3f0cb (regen post rebase)
-a7f3c6f6e29d897104debea55952dca83bc273d4f45654f97102e9e22b9f3741
-=======
-3537a9f15a0ad721739c6e8a2acdf69664970a788761f6d6d7f3d5734090569b
->>>>>>> 5e6f3f0cb (regen post rebase)
-||||||| parent of 810148af0 (tests and extensions for components.ClassId)
-3537a9f15a0ad721739c6e8a2acdf69664970a788761f6d6d7f3d5734090569b
-=======
-9e8a5d753d77ccd044b75302ff9c0e72a49de37d33f079cd2eff714bd1646c48
->>>>>>> 810148af0 (tests and extensions for components.ClassId)
-||||||| parent of fb85bae28 (tests and extensions for components.Color)
-9e8a5d753d77ccd044b75302ff9c0e72a49de37d33f079cd2eff714bd1646c48
-=======
-359893dcaa82cbfbd23f1084a2a8e34bb306f1bd6b21d3d0f0b5c04be232f763
->>>>>>> fb85bae28 (tests and extensions for components.Color)
-||||||| parent of b90647911 (ignore weird inheritance lint -- whatever)
-359893dcaa82cbfbd23f1084a2a8e34bb306f1bd6b21d3d0f0b5c04be232f763
-=======
-4ae0169c023baf6a9f00ef2e3d23ca1886ec324f7a7f7c10071095b4e5976e38
->>>>>>> b90647911 (ignore weird inheritance lint -- whatever)
-=======
-e35c1a4c211f7b8f13a32334727d965d6c8541e7113843f2f5e3b45e47037303
->>>>>>> 51553d666 (regen post rebase)
+36413079f04fff0aeff7d23f1430be617034159b95e03970e61db06ba950ebe1
\ No newline at end of file