solve commit merge the wrong way obiously.

Package-Manager: portage-2.2.0_alpha171