fixed stray merge <<< HEAD section in server code --KW