systemd: Fix redundant conflict which confuses the solver.
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x