server.c dev.
conflictsolving