merge powerline config with upstream