Fixed GRADER conflicts