Finish merging makefiles