add stats
solve conflicts