removed deletion of temp dir in makefile
Added buid folder
resoved conflict in makefile