merge Makefile.am