diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 6b9cc6ebf..5802d7ef6 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,5 +1,6 @@
 ## RELEASE NOTES
 
+<<<<<<< HEAD
 ### Version 2.0.0 - March xx, 2015
 
 -**Migration Guide**
@@ -265,6 +266,16 @@
 - **Table** - Horizontal cell padding has been slightly reduced, and cell borders are slightly lighter.
 - **Transition - Transition no longer checks for vendor prefixed `animation-name` css property. This was introduced in jQuery `1.8`
 - **Visibility** - In returned `calculations` object, `visible` and `hidden` are renamed to `onScreen` and `offScreen`, since this describes more accurately what the value represents.
+=======
+
+### Version 1.12.3 - May 20, 2015
+
+**Announcement**
+Version 2.0 will be launching on June 1st, which will include 100+ bug fixes, enhancements, new ui, and default theme improvements.
+
+**Bugs**
+- **Grid** - Fixes bug causing colored variations not to work on columns without row wrappers. Backport from `2.x`
+>>>>>>> 1f541d830bd40a5594621aedec8a326391430c15
 
 ### Version 1.12.2 - May 4, 2015
 
diff --git a/bower.json b/bower.json
index 2f82943b7..25f386f20 100644
--- a/bower.json
+++ b/bower.json
@@ -10,7 +10,7 @@
     "jquery"      : ">=1.8"
   },
   "main": [
-    "dist/semantic.css",
+    "src/semantic.less",
     "dist/semantic.js"
   ],
   "keywords": [
diff --git a/package.json b/package.json
index 854456744..d5f6756c1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,10 @@
 {
   "name"        : "semantic-ui",
+<<<<<<< HEAD
   "version"     : "2.0.0",
+=======
+  "version"     : "1.12.3",
+>>>>>>> 1f541d830bd40a5594621aedec8a326391430c15
   "title"       : "Semantic UI",
   "description" : "Semantic empowers designers and developers by creating a shared vocabulary for UI.",
   "homepage"    : "http://www.semantic-ui.com",
diff --git a/src/themes/default/elements/icon.variables b/src/themes/default/elements/icon.variables
index 365612b07..d21f242de 100644
--- a/src/themes/default/elements/icon.variables
+++ b/src/themes/default/elements/icon.variables
@@ -17,7 +17,7 @@
 ;
 
 @opacity: 1;
-@width: 1.23em;
+@width: @iconWidth;
 @height: 1em;
 @distanceFromText: 0.25rem;
 
@@ -58,4 +58,3 @@
 @big: 2em;
 @huge: 4em;
 @massive: 8em;
-