john is now the server
fixed merged conflict