Fix merge and vendor repo/branch