Merge "Fix the overlap problem in the Schedule Rule page"