made changes to stats
fixed merge conflict