fixed config conflict
added Makefile