makefile conflits edits