Fixed client.c conflict