diff --git a/cyclops-invokedynamic/src/main/java/com/aol/cyclops/invokedynamic/ExceptionSoftener.java b/cyclops-invokedynamic/src/main/java/com/aol/cyclops/invokedynamic/ExceptionSoftener.java
index 84aef772..c99932c1 100644
--- a/cyclops-invokedynamic/src/main/java/com/aol/cyclops/invokedynamic/ExceptionSoftener.java
+++ b/cyclops-invokedynamic/src/main/java/com/aol/cyclops/invokedynamic/ExceptionSoftener.java
@@ -7,6 +7,7 @@
 @UtilityClass
 public class ExceptionSoftener {
 
+<<<<<<< HEAD
 	public static <T extends Throwable,R> R throwSoftenedException(final T e) {
 		uncheck(e);
 		return null;
@@ -15,6 +16,18 @@ public static <T extends Throwable,R> R throwSoftenedException(final T e) {
 	private static <T extends Throwable> void uncheck(Throwable throwable) throws T {
 		throw (T) throwable;
 
+=======
+	
+	
+	
+	public static RuntimeException throwSoftenedException(final Throwable e) {
+		throw ExceptionSoftener.<RuntimeException>uncheck(e);
+	}
+	
+	@SuppressWarnings("unchecked")
+	private static <T extends Throwable> T uncheck(Throwable throwable) throws T {
+		throw (T) throwable;
+>>>>>>> 541bfbd5f5ab031ffed5125fc0061194c124f340
 	}
 	
 	public static Integer myTest(){