Bug 8846 conflict resolution: correct path