Update server.rst
resolution de conflit
resolv conflict