Merge "Bug 509: Improve conflict detection of leaf merges"