Conflict in HEAD between suffix.mk and config.mk.in