Is it possible a colleague can have available a higher VBS update version than me?

Summary:

We are working with branches & feature branches.

Each time I want to merge my changes to feature branch (after having first created a copy of the feature branch to start my development - and no one merged anything in between) I get conflicts due to the version. I can only see upto version 2504 while we are already in release 25D, my colleague has availabile a higher version.

Is this normal?

How can we solve this to avoid having conflicts at that point.

Thanks,

Pilar

Version (include the version you are using, if applicable):

25 D