The merge conflicts to development, the devs will take care of themselves.

Sometimes (but not very often) it happens, that we face conflicts in staging, but that is very rare and only, if somebody did not follow the structure strict enough.

In general ALL code, that is used in staging, should exist in development as well.

So the merge conflicts only appear in development.

It is very important to commit and merge frequently, to avoid problems in bigger teams, but that's a best practice anyway.