Makefile.am for merging, tested