Resolving conflicts with makefile