Merging server commits