fixed statistic functionality
fixed conflicts