Working on grades fragment.
fixing conflict