Fixed the merge issues from merge with schedule related section