Updated resharper and added some logging
Merge