resolve merge conflict

diff --cc Makefile
index 738b95914926d6700b43c66548cffcd39e455aaf,c477b6a6d1e81ac32e3d76af68570b11f21c62f5..e9204bd957936af24f327c709c181aa0e06e66cc
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -30,7 -30,7 +30,8 @@@ OBJS = source/main.o    
         source/codegen.o
  
  .PHONY: all specs tests
- all: sclpl tests
++
+ all: ${BIN} tests
  
  lib${BIN}.a: ${OBJS}
        ${AR} ${ARFLAGS} $@ $^