resolve merge noise in favor of new upstream. note that this tosses out the
[debian/gzip] / nt /
drwxr-xr-x   ..
-rw-r--r-- 1658 Makefile.nt