linki: merge vel rebase