configroot: fix merge problem.