fix bug about statistics
fix conflicts