[Bug 441066] Conflict resolution does not work