PartsBin: Fixing publish dialog after merge conflict