swift234

Remove more merge conflict markers to fix the build.

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

Swift SVN r28313