Merging new code with server