Remove trailing merge 'info' in Vendorfile

<<<HEAD et al