[ci skip] Merge woops in changelog