Some merge of makefiles.