Merge server for now