merge make.conf.10.0-10.0@re