Remove more merge conflict markers to fix the build.
Remove more merge conflict markers to fix the build.

Select 'count' from one side, and 'print' from the other.

Swift SVN r28313

codestergit/swift,ken0nek/swift,manavgabhawala/swift,natecook1000/swift,jckarter/swift,swiftix/swift.old,IngmarStein/swift,ben-ng/swift,emilstahl/swift,lorentey/swift,kperryua/swift,xwu/swift,emilstahl/swift,djwbrown/swift,brentdax/swift,jmgc/swift,danielmartin/swift,tardieu/swift,aschwaighofer/swift,aschwaighofer/swift,milseman/swift,swiftix/swift,djwbrown/swift,CodaFi/swift,calebd/swift,practicalswift/swift,SwiftAndroid/swift,felix91gr/swift,parkera/swift,khizkhiz/swift,uasys/swift,brentdax/swift,slavapestov/swift,tjw/swift,swiftix/swift,stephentyrone/swift,manavgabhawala/swift,rudkx/swift,kusl/swift,gottesmm/swift,tinysun212/swift-windows,frootloops/swift,rudkx/swift,amraboelela/swift,nathawes/swift,therealbnut/swift,tkremenek/swift,jckarter/swift,devincoughlin/swift,CodaFi/swift,milseman/swift,xwu/swift,therealbnut/swift,lorentey/swift,jopamer/swift,IngmarStein/swift,bitjammer/swift,deyton/swift,swiftix/swift.old,practicalswift/swift,karwa/swift,cbrentharris/swift,shajrawi/swift,danielmartin/swift,apple/swift,frootloops/swift,CodaFi/swift,CodaFi/swift,frootloops/swift,emilstahl/swift,devincoughlin/swift,JaSpa/swift,ken0nek/swift,emilstahl/swift,JaSpa/swift,stephentyrone/swift,mightydeveloper/swift,uasys/swift,kentya6/swift,kentya6/swift,sdulal/swift,brentdax/swift,sdulal/swift,shajrawi/swift,kperryua/swift,shajrawi/swift,zisko/swift,zisko/swift,xwu/swift,roambotics/swift,ben-ng/swift,dduan/swift,tkremenek/swift,airspeedswift/swift,airspeedswift/swift,modocache/swift,mightydeveloper/swift,Ivacker/swift,glessard/swift,tardieu/swift,gottesmm/swift,shahmishal/swift,airspeedswift/swift,Ivacker/swift,KrishMunot/swift,jtbandes/swift,mightydeveloper/swift,harlanhaskins/swift,allevato/swift,deyton/swift,aschwaighofer/swift,sdulal/swift,CodaFi/swift,gregomni/swift,SwiftAndroid/swift,tardieu/swift,uasys/swift,IngmarStein/swift,tjw/swift,jckarter/swift,lorentey/swift,apple/swift,uasys/swift,ben-ng/swift,allevato/swift,MukeshKumarS/Swift,roambotics/swift,gottesmm/swift,alblue/swift,bitjammer/swift,shajrawi/swift,parkera/swift,russbishop/swift,djwbrown/swift,tkremenek/swift,tardieu/swift,sschiau/swift,parkera/swift,khizkhiz/swift,jopamer/swift,kperryua/swift,atrick/swift,emilstahl/swift,dreamsxin/swift,atrick/swift,cbrentharris/swift,tjw/swift,benlangmuir/swift,atrick/swift,danielmartin/swift,arvedviehweger/swift,ahoppen/swift,johnno1962d/swift,codestergit/swift,tkremenek/swift,hughbe/swift,gribozavr/swift,JGiola/swift,LeoShimonaka/swift,return/swift,allevato/swift,tardieu/swift,JGiola/swift,hughbe/swift,swiftix/swift,felix91gr/swift,adrfer/swift,JGiola/swift,apple/swift,SwiftAndroid/swift,MukeshKumarS/Swift,KrishMunot/swift,kstaring/swift,hooman/swift,LeoShimonaka/swift,swiftix/swift,Jnosh/swift,danielmartin/swift,gregomni/swift,huonw/swift,gottesmm/swift,adrfer/swift,austinzheng/swift,jtbandes/swift,kstaring/swift,shajrawi/swift,xedin/swift,LeoShimonaka/swift,aschwaighofer/swift,tkremenek/swift,austinzheng/swift,xedin/swift,danielmartin/swift,devincoughlin/swift,MukeshKumarS/Swift,devincoughlin/swift,devincoughlin/swift,gottesmm/swift,adrfer/swift,russbishop/swift,harlanhaskins/swift,codestergit/swift,rudkx/swift,glessard/swift,sdulal/swift,benlangmuir/swift,manavgabhawala/swift,jtbandes/swift,karwa/swift,alblue/swift,danielmartin/swift,parkera/swift,KrishMunot/swift,harlanhaskins/swift,gribozavr/swift,bitjammer/swift,xedin/swift,ben-ng/swift,austinzheng/swift,Ivacker/swift,harlanhaskins/swift,jtbandes/swift,zisko/swift,swiftix/swift,JGiola/swift,tjw/swift,uasys/swift,sschiau/swift,ben-ng/swift,devincoughlin/swift,Jnosh/swift,cbrentharris/swift,gmilos/swift,deyton/swift,Ivacker/swift,glessard/swift,KrishMunot/swift,roambotics/swift,cbrentharris/swift,gottesmm/swift,dduan/swift,JGiola/swift,slavapestov/swift,zisko/swift,kentya6/swift,bitjammer/swift,harlanhaskins/swift,uasys/swift,jckarter/swift,milseman/swift,IngmarStein/swift,jmgc/swift,frootloops/swift,roambotics/swift,SwiftAndroid/swift,alblue/swift,allevato/swift,amraboelela/swift,swiftix/swift.old,kperryua/swift,shahmishal/swift,modocache/swift,codestergit/swift,kperryua/swift,swiftix/swift,jopamer/swift,kusl/swift,lorentey/swift,apple/swift,dduan/swift,return/swift,Jnosh/swift,OscarSwanros/swift,benlangmuir/swift,adrfer/swift,cbrentharris/swift,OscarSwanros/swift,allevato/swift,shahmishal/swift,ken0nek/swift,atrick/swift,tardieu/swift,milseman/swift,sschiau/swift,codestergit/swift,kstaring/swift,brentdax/swift,tinysun212/swift-windows,IngmarStein/swift,swiftix/swift.old,hooman/swift,JGiola/swift,gribozavr/swift,hooman/swift,zisko/swift,benlangmuir/swift,sschiau/swift,tinysun212/swift-windows,airspeedswift/swift,felix91gr/swift,alblue/swift,shahmishal/swift,jmgc/swift,ahoppen/swift,johnno1962d/swift,slavapestov/swift,sschiau/swift,calebd/swift,manavgabhawala/swift,MukeshKumarS/Swift,swiftix/swift.old,emilstahl/swift,gribozavr/swift,kusl/swift,jmgc/swift,swiftix/swift.old,Jnosh/swift,johnno1962d/swift,LeoShimonaka/swift,tkremenek/swift,swiftix/swift.old,ahoppen/swift,khizkhiz/swift,shahmishal/swift,johnno1962d/swift,roambotics/swift,OscarSwanros/swift,swiftix/swift.old,jopamer/swift,djwbrown/swift,ken0nek/swift,xedin/swift,sdulal/swift,gmilos/swift,shajrawi/swift,stephentyrone/swift,KrishMunot/swift,aschwaighofer/swift,mightydeveloper/swift,gmilos/swift,Ivacker/swift,kusl/swift,huonw/swift,jckarter/swift,karwa/swift,nathawes/swift,jmgc/swift,jckarter/swift,austinzheng/swift,dreamsxin/swift,karwa/swift,jtbandes/swift,tardieu/swift,tinysun212/swift-windows,sdulal/swift,emilstahl/swift,adrfer/swift,KrishMunot/swift,deyton/swift,ahoppen/swift,frootloops/swift,arvedviehweger/swift,gmilos/swift,calebd/swift,IngmarStein/swift,aschwaighofer/swift,amraboelela/swift,adrfer/swift,calebd/swift,jopamer/swift,therealbnut/swift,parkera/swift,ken0nek/swift,lorentey/swift,gribozavr/swift,gribozavr/swift,deyton/swift,djwbrown/swift,therealbnut/swift,gottesmm/swift,lorentey/swift,JaSpa/swift,xwu/swift,ahoppen/swift,return/swift,aschwaighofer/swift,modocache/swift,gmilos/swift,modocache/swift,MukeshKumarS/Swift,ahoppen/swift,uasys/swift,practicalswift/swift,ken0nek/swift,modocache/swift,manavgabhawala/swift,johnno1962d/swift,lorentey/swift,gmilos/swift,LeoShimonaka/swift,hughbe/swift,practicalswift/swift,alblue/swift,harlanhaskins/swift,jtbandes/swift,manavgabhawala/swift,emilstahl/swift,dduan/swift,felix91gr/swift,xedin/swift,kentya6/swift,sdulal/swift,austinzheng/swift,return/swift,kusl/swift,LeoShimonaka/swift,allevato/swift,brentdax/swift,gregomni/swift,OscarSwanros/swift,zisko/swift,ken0nek/swift,mightydeveloper/swift,arvedviehweger/swift,khizkhiz/swift,apple/swift,bitjammer/swift,djwbrown/swift,nathawes/swift,kentya6/swift,nathawes/swift,brentdax/swift,rudkx/swift,natecook1000/swift,cbrentharris/swift,kstaring/swift,natecook1000/swift,JaSpa/swift,parkera/swift,slavapestov/swift,atrick/swift,frootloops/swift,felix91gr/swift,gregomni/swift,KrishMunot/swift,khizkhiz/swift,slavapestov/swift,milseman/swift,nathawes/swift,benlangmuir/swift,dduan/swift,huonw/swift,alblue/swift,shajrawi/swift,tjw/swift,sschiau/swift,shahmishal/swift,slavapestov/swift,amraboelela/swift,gmilos/swift,devincoughlin/swift,calebd/swift,practicalswift/swift,benlangmuir/swift,tkremenek/swift,stephentyrone/swift,manavgabhawala/swift,glessard/swift,sdulal/swift,ben-ng/swift,parkera/swift,hughbe/swift,huonw/swift,tinysun212/swift-windows,OscarSwanros/swift,kusl/swift,russbishop/swift,felix91gr/swift,stephentyrone/swift,lorentey/swift,russbishop/swift,glessard/swift,ben-ng/swift,johnno1962d/swift,huonw/swift,return/swift,jtbandes/swift,xedin/swift,hughbe/swift,arvedviehweger/swift,xwu/swift,natecook1000/swift,brentdax/swift,LeoShimonaka/swift,SwiftAndroid/swift,jmgc/swift,harlanhaskins/swift,mightydeveloper/swift,return/swift,modocache/swift,kentya6/swift,xedin/swift,cbrentharris/swift,huonw/swift,CodaFi/swift,CodaFi/swift,stephentyrone/swift,tinysun212/swift-windows,roambotics/swift,codestergit/swift,parkera/swift,jmgc/swift,hooman/swift,hooman/swift,swiftix/swift,SwiftAndroid/swift,Jnosh/swift,karwa/swift,natecook1000/swift,airspeedswift/swift,OscarSwanros/swift,kentya6/swift,hughbe/swift,gribozavr/swift,JaSpa/swift,Ivacker/swift,amraboelela/swift,nathawes/swift,hooman/swift,felix91gr/swift,cbrentharris/swift,alblue/swift,jopamer/swift,amraboelela/swift,karwa/swift,Ivacker/swift,kusl/swift,slavapestov/swift,russbishop/swift,tjw/swift,austinzheng/swift,MukeshKumarS/Swift,kusl/swift,IngmarStein/swift,russbishop/swift,shahmishal/swift,khizkhiz/swift,therealbnut/swift,johnno1962d/swift,codestergit/swift,gregomni/swift,JaSpa/swift,rudkx/swift,kentya6/swift,frootloops/swift,sschiau/swift,amraboelela/swift,dduan/swift,xedin/swift,MukeshKumarS/Swift,shajrawi/swift,arvedviehweger/swift,tjw/swift,practicalswift/swift,gribozavr/swift,danielmartin/swift,deyton/swift,SwiftAndroid/swift,allevato/swift,kperryua/swift,jopamer/swift,JaSpa/swift,kstaring/swift,Jnosh/swift,kperryua/swift,khizkhiz/swift,kstaring/swift,devincoughlin/swift,gregomni/swift,huonw/swift,rudkx/swift,atrick/swift,therealbnut/swift,glessard/swift,adrfer/swift,jckarter/swift,modocache/swift,natecook1000/swift,airspeedswift/swift,arvedviehweger/swift,bitjammer/swift,arvedviehweger/swift,hughbe/swift,karwa/swift,milseman/swift,nathawes/swift,calebd/swift,russbishop/swift,natecook1000/swift,hooman/swift,zisko/swift,shahmishal/swift,mightydeveloper/swift,stephentyrone/swift,xwu/swift,mightydeveloper/swift,bitjammer/swift,xwu/swift,tinysun212/swift-windows,dduan/swift,austinzheng/swift,return/swift,deyton/swift,Jnosh/swift,practicalswift/swift,apple/swift,LeoShimonaka/swift,OscarSwanros/swift,sschiau/swift,practicalswift/swift,therealbnut/swift,airspeedswift/swift,Ivacker/swift,kstaring/swift,djwbrown/swift,milseman/swift,calebd/swift,karwa/swift