Makefile creates bin and obj directories.
Conflict resolved.