diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 7b2e3d573..061b4e45f 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,7 +1,6 @@
 ## RELEASE NOTES
 
-<<<<<<< HEAD
-### Version 1.11.0 - February xx, 2015
+### Version 1.11.0 - March xx, 2015
 
 **New Components**
 - **Visibiliity** - Attach callbacks to elements visibility conditions like `top visible` `bottom visible`, `passing`. Useful for things like: image lazy loading, infinite scroll content, and recording tracking metrics
@@ -14,6 +13,7 @@
 
 **Bugs**
 - **Dropdown** - Fixes issue where dropdown would not open after restoring previus value on failed `search dropdown` search
+- **Popup** - Fix popup not namespacing `window` events and unbinding on `destroy` **Thanks @revov**
 - **Transition** - Fixes `swing out` animations not working correctly
 - **Transition** - Fixed display state other than `block` not determined when using `show` and `hide` without an animation
 - **Transition** - Fix bug in `remove looping` causing next animation to use same duration
@@ -24,12 +24,11 @@
 **Docs**
 - **Transition** - Adds examples of `hide, `show`, `toggle`, `stop`, `stop all`, and `clear queue`
 - **Item** - Significant rewrite of `ui item` documentation
-=======
+
 ### Version 1.10.4 - February 28, 2015
 
 - **API** - Remove console error message when no API url is specified but element is a `form` (defaults to `form` action)
 - **API** - `api` check for [serialize object](https://github.com/macek/jquery-serialize-object) optional dependency no longer produces error when `serializeForm: true` and dependency is not found.
->>>>>>> 698f0710ccfbec0bf1ceaa8421c77f1b9c8186aa
 
 ### Version 1.10.3 - February 27, 2015
 
diff --git a/src/definitions/modules/sidebar.js b/src/definitions/modules/sidebar.js
index 3002cb636..f4ebc97d9 100644
--- a/src/definitions/modules/sidebar.js
+++ b/src/definitions/modules/sidebar.js
@@ -115,8 +115,8 @@ $.fn.sidebar = function(parameters) {
         create: {
           id: function() {
             id = (Math.random().toString(16) + '000000000').substr(2,8);
-            module.verbose('Creating unique id for element', id);
             elementNamespace = '.' + id;
+            module.verbose('Creating unique id for element', id);
           }
         },
 
diff --git a/src/definitions/modules/transition.js b/src/definitions/modules/transition.js
index e17ad1406..ad8119d9d 100644
--- a/src/definitions/modules/transition.js
+++ b/src/definitions/modules/transition.js
@@ -392,7 +392,6 @@ $.fn.transition = function() {
               $module.removeAttr('class');
             }
             if(module.cache.style) {
-              console.log(module.cache.style);
               module.verbose('Restoring original style attribute', module.cache.style);
               $module.attr('style', module.cache.style);
             }