Current flow leads to merge conflicts in pull requests in section 4

[svenvanderburg]

trafficstars

Currently, the flow leading up to section 4 results in merge conflicts when opening a pull request from feature-std-dev into dev, because in the meantime there have been changes in the dev branch.

I suggest to add a callout on merge conflicts and how to resolve them because they will one way or another arise for some participants.