Get conflicts again.

git-svn-id: https://repo.thevirtualbrain.org/testgit/trunk@23 a79c6d67-9624-418e-af80-2fa85c78f146
Merge.

git-svn-id: https://repo.thevirtualbrain.org/testgit/trunk@24 a79c6d67-9624-418e-af80-2fa85c78f146