Your branch is behind dev because another developer has already merged their changes. How to update your branch and resolve conflicts?