swap server build back to master