NetworkManager merge fix