change in pmd/makefile.in
conflict fixed.