testing server bug
resolving client conflicts