cleaning up merge conflicts.

There are numbers merge conflicts in this file. I might have removed incorrect ones.
Merge pull request #2 from johnnye/patch-1

cleaning up merge conflicts.