Added Mac OS X support to Makefile
Fixed merge conflict in Makefile