Conflicts resolved on student assignments mode.