any time

master

is updated from any branch besides

develop

, you will need to merge

master

down into develop so that it's not behind