diff --git a/Makefile b/Makefile
index 95b1c20..b770943 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ OBJ := listlogic.go mcron.go ports.go short.go
 .PHONY: all clean install uninstall
 all: $(OBJ)
 
+<<<<<<< Updated upstream
 %.go: tk/%.scm
 	GUILE_AUTO_COMPILE=0 guild compile $< -o $@
 
@@ -11,6 +12,24 @@ install:
 	cp    -fr tk   $(TARGET)
 	mkdir -p       $(CCACHE)/tk
 	cp    -f  *.go $(CCACHE)/tk
+=======
+%.go: %.scm
+	@GUILE_AUTO_COMPILE=0 guild compile $< -o $@
+
+install: $(TARGET)/tk $(CCACHE)/tk
+
+$(TARGET)/tk:
+	@echo "Installing..."
+	mkdir -p       $(TARGET)/tk
+	cp    -f *.scm $(TARGET)/tk
+	@echo "Install complete."
+
+$(CCACHE)/tk: $(OBJ)
+	@echo "Caching objects..."
+	mkdir -p       $(CCACHE)/tk
+	cp    -f *.go  $(CCACHE)/tk
+	@echo "Cache complete."
+>>>>>>> Stashed changes
 
 uninstall:
 	rm -fr $(TARGET)/tk