actually check root
Merge remote-tracking branch 'origin/fix'

Conflicts:
	vmx