Main statistics added
Details statistics
Merge conflict