Missed some more conflicted lines.

This should be the last of them.