Modified checklist_status_server
fixed conflict