[Bug 350415] Update Cannot Resolve Conflicts