update reporting
add more per commit reporting goodness
merge conflict