added the merged modules both client and server