diff --git a/elements.less b/elements.less
index 11fd8d5..0f55551 100644
--- a/elements.less
+++ b/elements.less
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /*! ---------------------------------------------------
     LESS Elements 0.6.x
   ---------------------------------------------------
@@ -132,11 +133,20 @@
 	  transform: translate(@x, @y);
 	}
 	.opacity(@opacity: 0.5) {
-	  -moz-opacity: @opacity;
-	  -khtml-opacity: @opacity;
-	  -webkit-opacity: @opacity;
-	  opacity: @opacity;
-	}
+    @percent: @opacity * 100;
+    /* IE 8 */
+    -ms-filter: ~"progid:DXImageTransform.Microsoft.Alpha(opacity=@{percent})";
+    /* IE 5-7 */
+    filter: ~"alpha(opacity=@{percent})";
+    /* Netscape */
+    -moz-opacity: @opacity;
+    /* Safari 1.x */
+    -khtml-opacity: @opacity;
+    /* Webkit */
+    -webkit-opacity: @opacity;
+    /* Good browsers */
+    opacity: @opacity;
+  }
 }
 
 #transition{