cleaning up merge conflicts.

There are numbers merge conflicts in this file. I might have removed incorrect ones.