Highlight syntax in vfio.md
Fix branch conflicts