diff --git a/param.h b/param.h
index b96375376..e4b095a84 100644
--- a/param.h
+++ b/param.h
@@ -1154,9 +1154,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifdef HASWELL
 
-<<<<<<< HEAD
-#define SNUMOPT         8
-#define DNUMOPT         4
+#define SNUMOPT         16
+#define DNUMOPT         8
 
 #define GEMM_DEFAULT_OFFSET_A     0
 #define GEMM_DEFAULT_OFFSET_B     0
@@ -1164,19 +1163,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #define SYMV_P  8
 
-#define SWITCH_RATIO    4
-=======
-#define SNUMOPT		8
-#define DNUMOPT		4
-
-#define GEMM_DEFAULT_OFFSET_A	  0
-#define GEMM_DEFAULT_OFFSET_B     0
-#define GEMM_DEFAULT_ALIGN 0x03fffUL
-
-#define SYMV_P	8
-
 #define SWITCH_RATIO	4
->>>>>>> origin/haswell
 
 #ifdef ARCH_X86
 
@@ -1246,10 +1233,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define ZGEMM_DEFAULT_Q 128
 
 #define SGEMM_DEFAULT_R sgemm_r
-<<<<<<< HEAD
-=======
-//#define DGEMM_DEFAULT_R dgemm_r
->>>>>>> origin/haswell
 #define DGEMM_DEFAULT_R 13824
 #define CGEMM_DEFAULT_R cgemm_r
 #define ZGEMM_DEFAULT_R zgemm_r