resolved merge conflicts

diff --cc src/atomic-waker/debian/changelog
index d32a53199ce5a340ce52323c66fd4948bff5f6c0,fa1009f0f260e2b928a484b1721d76fdf3185cfb..f169dd76264e44bad8b1a848f053898d9a28ee98
--- 1/src/atomic-waker/debian/changelog
--- 2/src/atomic-waker/debian/changelog
+++ b/src/atomic-waker/debian/changelog
@@@ -1,7 -1,6 +1,10 @@@
  rust-atomic-waker (1.1.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
  
    * Package atomic-waker 1.1.0 from crates.io using debcargo 2.6.0
++<<<<<<< HEAD
 +  * Added collapse_features
++=======
++>>>>>>> pending-serde-path-to-error
  
   -- Matthias Geiger <matthias.geiger1024@tutanota.de>  Tue, 17 Jan 2023 15:06:18 +0100