fix branch of vendor aaaaaand hopefully fix sync