Revert "resolve upstream merge conflict in distclean"