base/power: fix all merge errors