fix conflict merge with off rep master
associate ip on resume VM