Fix conflicts I didn't notice.