diff --git a/packages/webawesome/docs/docs/resources/changelog.md b/packages/webawesome/docs/docs/resources/changelog.md
index f11f7a441..e9f191754 100644
--- a/packages/webawesome/docs/docs/resources/changelog.md
+++ b/packages/webawesome/docs/docs/resources/changelog.md
@@ -10,13 +10,15 @@ Components with the <wa-badge variant="warning">Experimental</wa-badge> badge sh
 
 ## Next
 
+
 ### New Features {data-no-outline}
 
 - Added `.wa-hover-rows` to native styles to opt-in to highlighting table rows on hover.
 
 ### Bug Fixes and Improvements {data-no-outline}
 
-- Fixed a bug in `<wa-dropdown>` that prevented the menu from flipping/shifting to keep the menu in the viewport [discuss:1106]
+- Fixed a bug in `<wa-select>` with options that had blank string values. [issue:1106]
+- Fixed a bug in `<wa-dropdown>` that prevented the menu from flipping/shifting to keep the menu in the viewport [issue:1136]
 - Fixed the themes page so it shows the correct palette and imports
 
 ## 3.0.0-beta.1
@@ -39,10 +41,8 @@ Many of these changes and improvements were the direct result of feedback from u
 - Renamed the `classic` theme to `shoelace`
 - Removed `:root` selector from all theme, color palette, and semantic color stylesheets except for the default theme and colors. All of these styles are now solely scoped to classes, such as `.wa-theme-awesome`, `.wa-palette-bright`, and `.wa-brand-orange`.
 - Removed most custom properties from components that can otherwise be styled with `::part()` selectors and standard CSS properties.
-  <<<<<<< HEAD
 - `<wa-dropdown>` was reworked and simplified to not use menu, menu item, menu label; use `<wa-dropdown-item>` instead
 - Renamed `pulse` attribute in `<wa-badge>` to `attention="pulse"` and added `attention="bounce"` [issue:940]
-  > > > > > > > next
 - Renamed the `vertical` attribute to `orientation="vertical"` in `<wa-split-panel>` and `<wa-divider>` to align with other components and the platform [issue:674]
 - Renamed certain boolean attributes to be consistent using the `with-*` and `without-*` pattern:
   - `<wa-button caret>` => `<wa-button with-caret>`
@@ -369,4 +369,4 @@ Many of these changes and improvements were the direct result of feedback from u
 
 </details>
 
-Did we miss something? [Let us know!](https://github.com/shoelace-style/webawesome-alpha/discussions)
+Did we miss something? [Let us know!](https://github.com/shoelace-style/webawesome-alpha/discussions)
\ No newline at end of file
diff --git a/packages/webawesome/src/components/select/select.test.ts b/packages/webawesome/src/components/select/select.test.ts
index bc63b8b12..656b7b0bb 100644
--- a/packages/webawesome/src/components/select/select.test.ts
+++ b/packages/webawesome/src/components/select/select.test.ts
@@ -904,23 +904,24 @@ describe('<wa-select>', () => {
 
         await el.show();
         const options = el.querySelectorAll('wa-option');
+        await aTimeout(100);
         // firefox doesnt like clicks -.-
         await clickOnElement(options[0]);
         await resetMouse();
         await el.updateComplete;
         expect(el.value).to.equal('');
 
-        await aTimeout(1);
+        await aTimeout(100);
         await clickOnElement(options[1]);
         await resetMouse();
         await el.updateComplete;
-        await aTimeout(1);
+        await aTimeout(100);
         expect(el.value).to.equal('option-2');
 
         await clickOnElement(options[0]);
         await resetMouse();
         await el.updateComplete;
-        await aTimeout(1);
+        await aTimeout(100);
         expect(el.value).to.equal('');
         await resetMouse();
       });