Projects >> android_packages_providers_ContactsProvider >>e34b6c291ea04cb88ff124455b6b1943e04d425c

Chunk
Conflicting content 
            verifyLocale();
        }

<<<<<<< HEAD
        startContactDirectoryManager();

        if (isAggregationUpgradeNeeded()) {
            upgradeAggregationAlgorithm();
        }

=======
>>>>>>> 8638e1e999596ddfe12cbb529e58ca2345185af4
        return (mDb != null);
    }
Solution content 
            verifyLocale();
        }

        startContactDirectoryManager();

        if (isAggregationUpgradeNeeded()) {
            upgradeAggregationAlgorithm();
        }

        return (mDb != null);
    }
File
ContactsProvider2.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation