client and server accept each other lovingly
merged our work