Resolved conflict in StyleCop.cache
Resolved conflict in StyleCop.cache