server not working after merge?