Log statistics
Resolve merge conflict