Merge the server.properties branch