Resolve Schedule conflicts
