fix server before merge, yo