Fix all merge conflicts.

Commit

6 years ago

Fix all merge conflicts. Note: this was done as a distinct commit in order to make it easier to see what's actually going on.