Fix conflict

diff --cc Makefile
index f85dbb9bee8524f8e6a240a24d2dc927350cc17e,6aee3e329df38352f8084559496d16260c086863..e5229ef7dfb562cfeb4a676b7718f40a1926ef0c
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -44,9 -44,9 +44,10 @@@ DLL_OBJS = $(PLAF_DLL_OBJS) 
        vm/compaction.o \
        vm/contexts.o \
        vm/data_heap.o \
+       vm/data_heap_checker.o \
        vm/debug.o \
        vm/dispatch.o \
 +      vm/embedded_pointers.o \
        vm/errors.o \
        vm/factor.o \
        vm/free_list.o \

diff --cc vm/layouts.hpp
Simple merge

diff --cc vm/vm.hpp
Simple merge