Makefile tweaks
resolving conflict