add sudent stasitic
fix conflict