Projects >> android_packages_providers_ContactsProvider >>2f3dea5e7ad22182915c5576b561622496afa574

Chunk
Conflicting content 
            verifyLocale();
        }

<<<<<<< HEAD
        startContactDirectoryManager();
=======
        if (isAggregationUpgradeNeeded()) {
            upgradeAggregationAlgorithm();
        }
>>>>>>> 2a0d5f9c628e723261bc5198e0fd606076b76b74

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

        startContactDirectoryManager();

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

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