dvar function-fixed the conflict issue

[Nauman702]

@oesteban Hi Oscar, I have fixed the issue by synching the fork with the central repo. I am creating the branches again for the PRs that were having conflicts. Thanks