resolved conflict in util/Makefile.am