diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index f008843a1..054c50d5c 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,5 +1,65 @@
 ## RELEASE NOTES
 
+<<<<<<< HEAD
+=======
+### Version 1.12.0 - March 11, 2015
+
+**New UI**
+- **Container** - Containers are fixed width containers meant for holding page contents, and are a simpler alternative to `ui page grid`, view more [examples in docs](http://www.semantic-ui.com/elements/container.html#examples)
+
+**Major Changes**
+- **Menu** - Menu now uses flexbox. This allows menu items to match each others heights regardless of each items content size. `right menu` content should now follow left menu content, instead of preceding it (with float).
+
+**Enhancements**
+- **Site** - Added in `pageOverflowX` variable, default theme hides horizontal scrollbars on `body`
+- **Divider** - `vertical divider` inside `ui grid` now accounts for column padding
+- **Grid** - `celled grid` now removes internal cells on mobile and tablet when used with `doubling` grid responsive variation
+- **Grid** - `equal height` and `equal width` now work without `row` wrappers
+- **Grid** - `equal height` rows can now be `stretched` as well as `middle aligned`, `bottom aligned` and `top aligned`!
+- **Headers** - Added new header type `sub header`, useful for displaying small headers alongside text content. See examples [in the header docs](http://www.semantic-ui.com/elements/header.html#sub-headers)
+- **Menu** - Added many new variables to menu
+- **Menu** - Horizontal menus now set a default image size for images / logos
+- **Menu** - Fixed several inheritance issues for `dropdown item` inside `menu` appearing as `menu item`.
+- **Menu** - The hover/active state of `dropdown item` have been adjusted to match `item`.
+- **Menu** - Vertical dropdown menus are no longer 100% width
+- **Menu** - Menus items are now slightly more padded
+- **Segment** - Added `padded` and `very padded` segment variations
+- **Sidebar** - Improved animation performance through performance debugging. Sidebar now caches, width, height, rtl direction on load.
+- **Table** - Added `vertical alignment` variations to `ui table`
+- **Visibility/Sticky** - Visibility and sticky now refresh automatically after page content loading to deal with changes in position from images loading
+- **Visibility/Sticky** - Visibility now uses pub/sub pattern to greatly improve scroll performance when attaching multiple events
+
+**Changes**
+- **Dropdown** - Dropdown padding values now resolve to exact pixel values from em
+- **Grid** - Small computer `page grid` gutters have been adjusted from 8% to 3% to allow for roomier layouts on small screens.
+- **Header/Table/Divider** - These components now pull border color defaults from `site.variables` instead of using their own values
+- **Input** - Input now use `em` instead of `rem` so they will inherit the size of the elements they are nested inside
+- **Menu** - `secondary pointing menu` has had some slight design tweaks, thinner lines, more padding
+- **Menu** - Active sub-menu items are now `bold`
+- **Menu** - Horizontal menus no longer use pointers on `active item` in the default theme
+- **Message** - Slightly increases `box-shadow`
+- **Site** - Adjusted global line height to the closest even pixel value
+- **Table** - Horizontal cell padding has been slightly reduced, and cell borders are slightly lighter.
+
+**Bugs**
+- **All Modules** - Performance logging now delays 500ms instead of 100ms for console logging to ensure all logs are captured in one group
+- **Card** - Fix card dimmer not appearing in minified release due to use of background shorthand property
+- **Checkbox** - Fix `disabled checkbox` sometimes displaying hand cursor
+- **Checkbox** - Fixes nested `dropdown` inside `checkbox` causing issues
+- **Dimmer** - Fixed `variation` setting not working correctly
+- **Dropdown** - Fix bug where `onChange` would call even when reselecting current value
+- **Dropdown** - Fixes issue with headers disappearing inside of `ui dropdown` when nested in `ui menu`
+- **Form** - Form sizes and input sizes now inherit from `site.variables`
+- **Grid** - `x column wide` inside `equal width/height` now cannot grow beyond column size
+- **Grid** - Fixes colored grid columns not appearing when not nested in rows
+- **Label** - Labels inside `header` now vertical align better by accounting for line height offset
+- **Message** - Message now uses `@lineHeight` from `site.variables`
+- **Popup** - Fixes issue with `min-width` in firefox exceeding `max-width` causing element to not wrap correctly
+- **Table** - `very basic table` now works together with `padded table`
+- **Table** - Fix inheritance of text alignment and vertical alignment
+- **Transition** - Fixed bug where transition could sometimes not occur when an element was determined to always be hidden
+
+>>>>>>> af76214... Fixes dimmer variation not working due to typo
 ### Version 1.11.3-4 - March 6, 2015
 
 **Enhancements**
diff --git a/src/definitions/modules/dimmer.js b/src/definitions/modules/dimmer.js
index 779a97220..71a8ed6d3 100644
--- a/src/definitions/modules/dimmer.js
+++ b/src/definitions/modules/dimmer.js
@@ -154,7 +154,7 @@ $.fn.dimmer = function(parameters) {
           ;
           if(settings.variation) {
             module.debug('Creating dimmer with variation', settings.variation);
-            $element.addClass(className.variation);
+            $element.addClass(settings.variation);
           }
           if(settings.dimmerName) {
             module.debug('Creating named dimmer', settings.dimmerName);