Fixed some merge conflicts.

Some mistakes were left/done in the previous conflict resolution commit.