iOS Conflicts Resolver