[Bug 951575] PowerPC repo have unresolvable conflict