number of new analysis
minor merge conflict resolution