Show more statistics
Fixed conflicts