proofx: fix wrong choice in a conflict resolution
proofx: fix wrong choice in a conflict resolution

beniz/root,mattkretz/root,mkret2/root,olifre/root,sawenzel/root,zzxuanyuan/root,BerserkerTroll/root,simonpf/root,bbockelm/root,BerserkerTroll/root,gbitzes/root,karies/root,root-mirror/root,esakellari/root,thomaskeck/root,thomaskeck/root,Y--/root,simonpf/root,krafczyk/root,CristinaCristescu/root,karies/root,georgtroska/root,abhinavmoudgil95/root,gbitzes/root,BerserkerTroll/root,mkret2/root,krafczyk/root,jrtomps/root,mattkretz/root,satyarth934/root,pspe/root,abhinavmoudgil95/root,thomaskeck/root,mkret2/root,jrtomps/root,lgiommi/root,lgiommi/root,olifre/root,zzxuanyuan/root-compressor-dummy,satyarth934/root,agarciamontoro/root,pspe/root,mkret2/root,sawenzel/root,gganis/root,root-mirror/root,agarciamontoro/root,abhinavmoudgil95/root,buuck/root,davidlt/root,bbockelm/root,mkret2/root,krafczyk/root,zzxuanyuan/root,mhuwiler/rootauto,satyarth934/root,krafczyk/root,agarciamontoro/root,Y--/root,karies/root,zzxuanyuan/root-compressor-dummy,Y--/root,lgiommi/root,root-mirror/root,esakellari/root,thomaskeck/root,buuck/root,mhuwiler/rootauto,sawenzel/root,BerserkerTroll/root,lgiommi/root,zzxuanyuan/root,CristinaCristescu/root,olifre/root,veprbl/root,gganis/root,BerserkerTroll/root,esakellari/root,karies/root,mkret2/root,gganis/root,mhuwiler/rootauto,beniz/root,pspe/root,karies/root,sawenzel/root,zzxuanyuan/root-compressor-dummy,root-mirror/root,mhuwiler/rootauto,buuck/root,buuck/root,jrtomps/root,thomaskeck/root,zzxuanyuan/root,abhinavmoudgil95/root,mhuwiler/rootauto,mattkretz/root,georgtroska/root,beniz/root,veprbl/root,simonpf/root,krafczyk/root,georgtroska/root,simonpf/root,zzxuanyuan/root,mhuwiler/rootauto,beniz/root,bbockelm/root,veprbl/root,esakellari/root,zzxuanyuan/root,sawenzel/root,abhinavmoudgil95/root,CristinaCristescu/root,sawenzel/root,pspe/root,georgtroska/root,simonpf/root,BerserkerTroll/root,gganis/root,zzxuanyuan/root,sawenzel/root,sawenzel/root,beniz/root,zzxuanyuan/root,BerserkerTroll/root,sawenzel/root,beniz/root,krafczyk/root,zzxuanyuan/root-compressor-dummy,pspe/root,gganis/root,bbockelm/root,satyarth934/root,simonpf/root,pspe/root,gganis/root,zzxuanyuan/root-compressor-dummy,thomaskeck/root,veprbl/root,satyarth934/root,esakellari/root,buuck/root,CristinaCristescu/root,olifre/root,georgtroska/root,satyarth934/root,mattkretz/root,gbitzes/root,satyarth934/root,root-mirror/root,lgiommi/root,georgtroska/root,abhinavmoudgil95/root,georgtroska/root,karies/root,krafczyk/root,CristinaCristescu/root,mattkretz/root,Y--/root,gbitzes/root,davidlt/root,davidlt/root,karies/root,jrtomps/root,zzxuanyuan/root,mhuwiler/rootauto,buuck/root,pspe/root,bbockelm/root,davidlt/root,esakellari/root,abhinavmoudgil95/root,mkret2/root,zzxuanyuan/root,satyarth934/root,lgiommi/root,CristinaCristescu/root,beniz/root,gbitzes/root,CristinaCristescu/root,buuck/root,agarciamontoro/root,pspe/root,davidlt/root,esakellari/root,satyarth934/root,lgiommi/root,abhinavmoudgil95/root,esakellari/root,georgtroska/root,gganis/root,bbockelm/root,zzxuanyuan/root-compressor-dummy,olifre/root,jrtomps/root,simonpf/root,mkret2/root,veprbl/root,esakellari/root,mkret2/root,simonpf/root,mattkretz/root,davidlt/root,jrtomps/root,veprbl/root,bbockelm/root,agarciamontoro/root,buuck/root,Y--/root,olifre/root,thomaskeck/root,thomaskeck/root,BerserkerTroll/root,karies/root,olifre/root,sawenzel/root,beniz/root,jrtomps/root,esakellari/root,krafczyk/root,zzxuanyuan/root,bbockelm/root,georgtroska/root,mkret2/root,karies/root,Y--/root,mhuwiler/rootauto,abhinavmoudgil95/root,root-mirror/root,mattkretz/root,mhuwiler/rootauto,bbockelm/root,abhinavmoudgil95/root,root-mirror/root,gganis/root,jrtomps/root,jrtomps/root,CristinaCristescu/root,abhinavmoudgil95/root,lgiommi/root,jrtomps/root,root-mirror/root,agarciamontoro/root,agarciamontoro/root,mkret2/root,agarciamontoro/root,veprbl/root,sawenzel/root,buuck/root,gganis/root,davidlt/root,gbitzes/root,root-mirror/root,zzxuanyuan/root-compressor-dummy,mhuwiler/rootauto,mhuwiler/rootauto,CristinaCristescu/root,mattkretz/root,olifre/root,gbitzes/root,olifre/root,satyarth934/root,gbitzes/root,Y--/root,lgiommi/root,Y--/root,root-mirror/root,lgiommi/root,simonpf/root,pspe/root,jrtomps/root,mattkretz/root,veprbl/root,root-mirror/root,bbockelm/root,gbitzes/root,BerserkerTroll/root,karies/root,gganis/root,gganis/root,davidlt/root,olifre/root,veprbl/root,simonpf/root,Y--/root,agarciamontoro/root,krafczyk/root,georgtroska/root,gbitzes/root,zzxuanyuan/root-compressor-dummy,mattkretz/root,beniz/root,georgtroska/root,davidlt/root,zzxuanyuan/root,karies/root,veprbl/root,Y--/root,olifre/root,pspe/root,Y--/root,davidlt/root,beniz/root,zzxuanyuan/root-compressor-dummy,mattkretz/root,simonpf/root,beniz/root,krafczyk/root,pspe/root,CristinaCristescu/root,agarciamontoro/root,thomaskeck/root,BerserkerTroll/root,davidlt/root,satyarth934/root,gbitzes/root,lgiommi/root,veprbl/root,thomaskeck/root,buuck/root,zzxuanyuan/root-compressor-dummy,CristinaCristescu/root,esakellari/root,zzxuanyuan/root-compressor-dummy,buuck/root,bbockelm/root,agarciamontoro/root,BerserkerTroll/root,krafczyk/root