no more merging in pugs results by hand

Either it runs on this machine, or it doesn't.
track changes from new build setup.

moritz++