change made in master branch after a change was made in dev-branch