Added delay timer to server
Fixing merge conflicts