way to better grad
adding the new grad
fixing the merging conflict
correcting a copy-paste error