diff --git a/wgpu/resources/codegen_report.md b/wgpu/resources/codegen_report.md
index 30cb560d..a6cc5579 100644
--- a/wgpu/resources/codegen_report.md
+++ b/wgpu/resources/codegen_report.md
@@ -20,11 +20,7 @@
 * Diffs for GPUQueue: add read_buffer, add read_texture, hide copy_external_image_to_texture
 * Validated 37 classes, 121 methods, 46 properties
 ### Patching API for backends/wgpu_native/_api.py
-<<<<<<< HEAD
-* Validated 37 classes, 122 methods, 0 properties
-=======
-* Validated 37 classes, 119 methods, 0 properties
->>>>>>> main
+* Validated 37 classes, 121 methods, 0 properties
 ## Validating backends/wgpu_native/_api.py
 * Enum field FeatureName.texture-compression-bc-sliced-3d missing in wgpu.h
 * Enum field FeatureName.clip-distances missing in wgpu.h