Fix merge error in nova_compute