Added Makefile
Fixed conflict