diff --git a/.gitignore b/.gitignore
index ed3f6e73..7bdf3002 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,9 +7,12 @@
 *.so
 *.so.*
 *.exe
+<<<<<<< Updated upstream
 *.dll
 *.class
 *.jar
+=======
+>>>>>>> Stashed changes
 
 qemu/config-all-devices.mak
 
diff --git a/tests/regress/Makefile b/tests/regress/Makefile
index 67c779df..285daaa2 100644
--- a/tests/regress/Makefile
+++ b/tests/regress/Makefile
@@ -1,3 +1,4 @@
+<<<<<<< Updated upstream
 CFLAGS += -Wall -Werror -I../../include
 LDLIBS += -L../../ -lm -lunicorn
 
@@ -14,6 +15,42 @@ TESTS = $(TESTS_SOURCE:%.c=%)
 .PHONY: all clean test
 
 test: $(TESTS)
+=======
+
+CFLAGS += -I../../include
+
+ifeq (MING,$(findstring MING,$(shell uname -s)))
+LDFLAGS += ../../unicorn.lib $(shell pkg-config --libs glib-2.0) -lpthread -lm
+else
+LDFLAGS += ../../libunicorn.a $(shell pkg-config --libs glib-2.0) -lpthread -lm
+endif
+
+TESTS = map_crash map_write
+TESTS += sigill sigill2
+TESTS += block_test
+TESTS += ro_mem_test nr_mem_test
+TESTS += timeout_segfault
+TESTS += rep_movsb
+TESTS += mem_unmap
+TESTS += mem_double_unmap
+TESTS += mem_protect
+TESTS += mem_exec
+TESTS += mips_kseg0_1
+TESTS += eflags_nosync
+TESTS += 00opcode_uc_crash
+TESTS += eflags_noset
+TESTS += mem_map_large
+TESTS += invalid_read_in_cpu_tb_exec
+TESTS += invalid_write_in_cpu_tb_exec_x86_64
+TESTS += x86_16_segfault
+TESTS += mips_invalid_read_of_size_4_when_tracing
+TESTS += invalid_read_in_tb_flush_x86_64
+TESTS += sparc_jump_to_zero
+TESTS += mips_delay_slot_code_hook
+TESTS += mem_nofree
+TESTS += rw_hookstack
+TESTS += threaded_emu_start
+>>>>>>> Stashed changes
 
 all: $(TESTS)
 
diff --git a/tests/regress/rw_hookstack.c b/tests/regress/rw_hookstack.c
index 73dcc64b..6941c6e5 100644
--- a/tests/regress/rw_hookstack.c
+++ b/tests/regress/rw_hookstack.c
@@ -52,26 +52,42 @@ int main(int argc, char *argv[])
     err = uc_mem_map(uc, ADDRESS, SIZE, UC_PROT_ALL);
     if(err != UC_ERR_OK) {
         printf("Failed to map memory %s\n", uc_strerror(err));
+<<<<<<< Updated upstream
         return 1;
+=======
+        return 2;
+>>>>>>> Stashed changes
     }
 
     err = uc_mem_write(uc, ADDRESS, CODE32, sizeof(CODE32) - 1);
     if(err != UC_ERR_OK) {
         printf("Failed to write to memory %s\n", uc_strerror(err));
+<<<<<<< Updated upstream
         return 1;
+=======
+        return 3;
+>>>>>>> Stashed changes
     }
 
 loop:
     err = uc_mem_map(uc, stkval, STACK_SIZE, UC_PROT_ALL);
     if(err != UC_ERR_OK) {
         printf("Failed to map memory %s\n", uc_strerror(err));
+<<<<<<< Updated upstream
         return 1;
+=======
+        return 4;
+>>>>>>> Stashed changes
     }
 
     err = uc_mem_write(uc, ESP, &val, sizeof(val));
     if(err != UC_ERR_OK) {
         printf("Failed to write to memory %s\n", uc_strerror(err));
+<<<<<<< Updated upstream
         return 1;
+=======
+        return 5;
+>>>>>>> Stashed changes
     }
 
 
@@ -85,7 +101,11 @@ loop:
         printf("Failed on uc_emu_start() with error returned %u: %s\n", err, uc_strerror(err));
 
         uc_close(uc);
+<<<<<<< Updated upstream
         return 1;
+=======
+        return 6;
+>>>>>>> Stashed changes
     }
 
     uc_reg_read(uc, UC_X86_REG_EAX, &EAX);