# Conflicts: # CoreStore.podspec # Sources/Convenience/NSFetchedResultsController+Convenience.swift # Sources/Info.plist