statistics template created
conflict fixed