diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 6671de6cd..2616a340a 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,5 +1,6 @@
 ## RELEASE NOTES
 
+<<<<<<< HEAD
 ### Version 2.0.0 - March xx, 2015
 
 **New UI / Major Changes**
@@ -146,6 +147,21 @@
 - **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
+=======
+### Version 1.12.0 - April 13, 2015
+
+**Enhancements**
+- **Visibility** - Adds updated visibility module from `2.x` channel. Visibility will automatically refresh by default after images load on page refresh. Fixes issues with element positions after image loading.
+- **Sticky** - Adds sticky module from `2.x` branch. Sticky elements now use pub/sub with drastically improved performance. Sticky elements that do not fit on page will now scroll at the same speed as the page is scrolled instead of slower.
+
+**Changes**
+- **Popup** - Popup no longer produces a console error when it cannot find an adequate position in the browser viewport.
+
+**Bugs**
+- **Build Tools** - Fixes issue with component glob matching twice (causing build to include file twice) if duplicate values found in `semantic.json` component.
+- **Input** - Backports fix from `2.x` for `ui fluid input` not appearing correctly.
+- **Visibility** - Fixed issue where `precache` behavior was missing from visibility causing `image` lazy loading to fail
+>>>>>>> ca030ebb332ab9249a9eafc2d158e49f48c294dc
 
 ### Version 1.11.8 - April 13, 2015
 
diff --git a/src/definitions/behaviors/visibility.js b/src/definitions/behaviors/visibility.js
index 2f1dbe2d6..880dc17bf 100644
--- a/src/definitions/behaviors/visibility.js
+++ b/src/definitions/behaviors/visibility.js
@@ -1093,4 +1093,4 @@ $.fn.visibility.settings = {
 
 };
 
-})( jQuery, window , document );
+})( jQuery, window , document );
\ No newline at end of file
diff --git a/src/definitions/modules/sticky.js b/src/definitions/modules/sticky.js
index 8dad2963e..40d2e7702 100644
--- a/src/definitions/modules/sticky.js
+++ b/src/definitions/modules/sticky.js
@@ -809,4 +809,4 @@ $.fn.sticky.settings = {
 
 };
 
-})( jQuery, window , document );
+})( jQuery, window , document );
\ No newline at end of file