diff --git a/benchmarks/opencl/aes/Makefile b/benchmarks/opencl/aes/Makefile
index 3ea71be6..47711c90 100644
--- a/benchmarks/opencl/aes/Makefile
+++ b/benchmarks/opencl/aes/Makefile
@@ -34,11 +34,7 @@ PROJECT=saxpy
 all: $(PROJECT).dump $(PROJECT).hex
 
 lib$(PROJECT).a: kernel.cl
-<<<<<<< HEAD
 	POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(RISCV_TOOL_PATH)/lib:$(POCL_CC_PATH)/lib $(POCL_CC_PATH)/bin/poclcc -o lib$(PROJECT).a kernel.cl
-=======
-	POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(RISCV_TOOL_PATH)/lib:$(POCL_CC_PATH)/lib $(POCL_CC_PATH)/bin/poclcc -o kernel.pocl kernel.cl
->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798
 
 $(PROJECT).elf: main.cc lib$(PROJECT).a
 	$(CXX) $(CXXFLAGS) -I$(POCL_RT_PATH)/include -L$(POCL_RT_PATH)/lib/static -L. $(VX_SRCS) main.cc -Wl,--whole-archive -l$(PROJECT) -Wl,--no-whole-archive $(LIBS) -o $(PROJECT).elf
@@ -53,8 +49,4 @@ run:
 	$(VX_SIMX_PATH)/Vcache_simX -E -a rv32i --core $(PROJECT).hex  -s -b 1> emulator.debug
 
 clean:
-<<<<<<< HEAD
-	rm -rf *.elf *.dump *.hex *.a *.pocl *.o
-=======
-	rm -rf *.elf *.dump *.hex *.a *.pocl
->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798
+	rm -rf *.elf *.dump *.hex *.a *.pocl *.o
\ No newline at end of file
diff --git a/benchmarks/opencl/bfs/Makefile b/benchmarks/opencl/bfs/Makefile
index e9d36202..ad748266 100644
--- a/benchmarks/opencl/bfs/Makefile
+++ b/benchmarks/opencl/bfs/Makefile
@@ -37,11 +37,7 @@ lib$(PROJECT).a: kernel.cl
 	POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(RISCV_TOOL_PATH)/lib:$(POCL_CC_PATH)/lib $(POCL_CC_PATH)/bin/poclcc -o lib$(PROJECT).a kernel.cl
 
 $(PROJECT).elf: main.cc lib$(PROJECT).a
-<<<<<<< HEAD
 	$(CXX) $(CXXFLAGS) -I$(POCL_RT_PATH)/include -L$(POCL_RT_PATH)/lib/static -L. $(VX_SRCS) main.cc timer.cc -Wl,--whole-archive -l$(PROJECT) -Wl,--no-whole-archive $(LIBS) -o $(PROJECT).elf
-=======
-	$(CXX) $(CXXFLAGS) -I$(POCL_RT_PATH)/include -L$(POCL_RT_PATH)/lib/static -L. $(VX_SRCS) main.cc -Wl,--whole-archive -l$(PROJECT) -Wl,--no-whole-archive $(LIBS) -o $(PROJECT).elf
->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798
 
 $(PROJECT).hex: $(PROJECT).elf
 	$(HEX) -O ihex $(PROJECT).elf $(PROJECT).hex
diff --git a/benchmarks/opencl/fft/Makefile b/benchmarks/opencl/fft/Makefile
index 3ea71be6..47711c90 100644
--- a/benchmarks/opencl/fft/Makefile
+++ b/benchmarks/opencl/fft/Makefile
@@ -34,11 +34,7 @@ PROJECT=saxpy
 all: $(PROJECT).dump $(PROJECT).hex
 
 lib$(PROJECT).a: kernel.cl
-<<<<<<< HEAD
 	POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(RISCV_TOOL_PATH)/lib:$(POCL_CC_PATH)/lib $(POCL_CC_PATH)/bin/poclcc -o lib$(PROJECT).a kernel.cl
-=======
-	POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(RISCV_TOOL_PATH)/lib:$(POCL_CC_PATH)/lib $(POCL_CC_PATH)/bin/poclcc -o kernel.pocl kernel.cl
->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798
 
 $(PROJECT).elf: main.cc lib$(PROJECT).a
 	$(CXX) $(CXXFLAGS) -I$(POCL_RT_PATH)/include -L$(POCL_RT_PATH)/lib/static -L. $(VX_SRCS) main.cc -Wl,--whole-archive -l$(PROJECT) -Wl,--no-whole-archive $(LIBS) -o $(PROJECT).elf
@@ -53,8 +49,4 @@ run:
 	$(VX_SIMX_PATH)/Vcache_simX -E -a rv32i --core $(PROJECT).hex  -s -b 1> emulator.debug
 
 clean:
-<<<<<<< HEAD
-	rm -rf *.elf *.dump *.hex *.a *.pocl *.o
-=======
-	rm -rf *.elf *.dump *.hex *.a *.pocl
->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798
+	rm -rf *.elf *.dump *.hex *.a *.pocl *.o
\ No newline at end of file
diff --git a/benchmarks/opencl/hotspot/Makefile b/benchmarks/opencl/hotspot/Makefile
index 3ea71be6..7e10d5fe 100644
--- a/benchmarks/opencl/hotspot/Makefile
+++ b/benchmarks/opencl/hotspot/Makefile
@@ -34,11 +34,7 @@ PROJECT=saxpy
 all: $(PROJECT).dump $(PROJECT).hex
 
 lib$(PROJECT).a: kernel.cl
-<<<<<<< HEAD
 	POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(RISCV_TOOL_PATH)/lib:$(POCL_CC_PATH)/lib $(POCL_CC_PATH)/bin/poclcc -o lib$(PROJECT).a kernel.cl
-=======
-	POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(RISCV_TOOL_PATH)/lib:$(POCL_CC_PATH)/lib $(POCL_CC_PATH)/bin/poclcc -o kernel.pocl kernel.cl
->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798
 
 $(PROJECT).elf: main.cc lib$(PROJECT).a
 	$(CXX) $(CXXFLAGS) -I$(POCL_RT_PATH)/include -L$(POCL_RT_PATH)/lib/static -L. $(VX_SRCS) main.cc -Wl,--whole-archive -l$(PROJECT) -Wl,--no-whole-archive $(LIBS) -o $(PROJECT).elf
@@ -53,8 +49,4 @@ run:
 	$(VX_SIMX_PATH)/Vcache_simX -E -a rv32i --core $(PROJECT).hex  -s -b 1> emulator.debug
 
 clean:
-<<<<<<< HEAD
 	rm -rf *.elf *.dump *.hex *.a *.pocl *.o
-=======
-	rm -rf *.elf *.dump *.hex *.a *.pocl
->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798
diff --git a/benchmarks/opencl/kmeans/Makefile b/benchmarks/opencl/kmeans/Makefile
index 73034561..ef4d8ecc 100644
--- a/benchmarks/opencl/kmeans/Makefile
+++ b/benchmarks/opencl/kmeans/Makefile
@@ -29,26 +29,16 @@ CXXFLAGS += -Wl,--gc-sections # enable garbage collection of unused input sectio
 
 LIBS = -lOpenCL
 
-<<<<<<< HEAD
 PROJECT=kmeans
-=======
 PROJECT=saxpy
->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798
 
 all: $(PROJECT).dump $(PROJECT).hex
 
 lib$(PROJECT).a: kernel.cl
-<<<<<<< HEAD
 	POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(RISCV_TOOL_PATH)/lib:$(POCL_CC_PATH)/lib $(POCL_CC_PATH)/bin/poclcc -o lib$(PROJECT).a kernel.cl
 
 $(PROJECT).elf: main.cc lib$(PROJECT).a
 	$(CXX) $(CXXFLAGS) -I$(POCL_RT_PATH)/include -L$(POCL_RT_PATH)/lib/static -L. $(VX_SRCS) main.cc rmse.c read_input.c cluster.c kmeans_clustering.c -Wl,--whole-archive -l$(PROJECT) -Wl,--no-whole-archive $(LIBS) -o $(PROJECT).elf
-=======
-	POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(RISCV_TOOL_PATH)/lib:$(POCL_CC_PATH)/lib $(POCL_CC_PATH)/bin/poclcc -o kernel.pocl kernel.cl
-
-$(PROJECT).elf: main.cc lib$(PROJECT).a
-	$(CXX) $(CXXFLAGS) -I$(POCL_RT_PATH)/include -L$(POCL_RT_PATH)/lib/static -L. $(VX_SRCS) main.cc -Wl,--whole-archive -l$(PROJECT) -Wl,--no-whole-archive $(LIBS) -o $(PROJECT).elf
->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798
 
 $(PROJECT).hex: $(PROJECT).elf
 	$(HEX) -O ihex $(PROJECT).elf $(PROJECT).hex
diff --git a/benchmarks/opencl/sort/Makefile b/benchmarks/opencl/sort/Makefile
index 3ea71be6..7e10d5fe 100644
--- a/benchmarks/opencl/sort/Makefile
+++ b/benchmarks/opencl/sort/Makefile
@@ -34,11 +34,7 @@ PROJECT=saxpy
 all: $(PROJECT).dump $(PROJECT).hex
 
 lib$(PROJECT).a: kernel.cl
-<<<<<<< HEAD
 	POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(RISCV_TOOL_PATH)/lib:$(POCL_CC_PATH)/lib $(POCL_CC_PATH)/bin/poclcc -o lib$(PROJECT).a kernel.cl
-=======
-	POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(RISCV_TOOL_PATH)/lib:$(POCL_CC_PATH)/lib $(POCL_CC_PATH)/bin/poclcc -o kernel.pocl kernel.cl
->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798
 
 $(PROJECT).elf: main.cc lib$(PROJECT).a
 	$(CXX) $(CXXFLAGS) -I$(POCL_RT_PATH)/include -L$(POCL_RT_PATH)/lib/static -L. $(VX_SRCS) main.cc -Wl,--whole-archive -l$(PROJECT) -Wl,--no-whole-archive $(LIBS) -o $(PROJECT).elf
@@ -53,8 +49,4 @@ run:
 	$(VX_SIMX_PATH)/Vcache_simX -E -a rv32i --core $(PROJECT).hex  -s -b 1> emulator.debug
 
 clean:
-<<<<<<< HEAD
 	rm -rf *.elf *.dump *.hex *.a *.pocl *.o
-=======
-	rm -rf *.elf *.dump *.hex *.a *.pocl
->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798
diff --git a/benchmarks/opencl/spmv/Makefile b/benchmarks/opencl/spmv/Makefile
index f6895a96..12aad1c4 100644
--- a/benchmarks/opencl/spmv/Makefile
+++ b/benchmarks/opencl/spmv/Makefile
@@ -34,11 +34,7 @@ PROJECT=saxpy
 all: $(PROJECT).dump $(PROJECT).hex
 
 lib$(PROJECT).a: kernel.cl
-<<<<<<< HEAD
 	POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(RISCV_TOOL_PATH)/lib:$(POCL_CC_PATH)/lib $(POCL_CC_PATH)/bin/poclcc -o lib$(PROJECT).a kernel.cl
-=======
-	POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(RISCV_TOOL_PATH)/lib:$(POCL_CC_PATH)/lib $(POCL_CC_PATH)/bin/poclcc -o kernel.pocl kernel.cl
->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798
 
 $(PROJECT).elf: main.cc lib$(PROJECT).a
 	$(CXX) $(CXXFLAGS) -I$(POCL_RT_PATH)/include -L$(POCL_RT_PATH)/lib/static -L. $(VX_SRCS) main.cc -Wl,--whole-archive -l$(PROJECT) -Wl,--no-whole-archive $(LIBS) -o $(PROJECT).elf
diff --git a/rtl/VX_define.v b/rtl/VX_define.v
index 02bc5926..b40567f8 100644
--- a/rtl/VX_define.v
+++ b/rtl/VX_define.v
@@ -11,13 +11,8 @@
 // `define ONLY
 
 // `define SYN 1
-<<<<<<< HEAD
-//`define ASIC 1
-//`define SYN_FUNC 1
-=======
 // `define ASIC 1
 // `define SYN_FUNC 1
->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798
 
 `define NUM_BARRIERS 4
 
diff --git a/syn/esyn.tcl b/syn/esyn.tcl
index 522fb262..10fa09d9 100644
--- a/syn/esyn.tcl
+++ b/syn/esyn.tcl
@@ -37,11 +37,7 @@ uniquify
 define_name_rules verilog -remove_internal_net_bus -remove_port_bus
 change_names -rule verilog -hierarchy
 
-<<<<<<< HEAD
-report_qor 
-=======
 # report_qor 
->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798
 report_area
 report_hierarchy
 report_cell