Removed leftover crud from merge collision.