fixed data/Makefile.am after merge