Merge server.properties