The server is running.
merged a conflict for the server