Fixing conflicts.

Removing conflict junk.