VGPU: Fixed conflicts

Signed-off-by: Vincent Bernardoff <vincent.bernardoff@citrix.com>