Oops. Didn't fix all merge conflicts. Fixed now.