testing
makefile for debugging
merging