adding in a count for conflicted files