student repetation bug fixed
fixed conlict