Added makefile
Fixing merge conflict