Resolved conflicts in ServerManagerJob.php by: - Keeping sentinel update check code from macau-v1 - Preserving sentinel restart code from next branch - Ensuring no duplicate code blocks