Merge Server Codes to Develop