First round of cleaning up merge conflicts.