Moved to DRUPAL-6--1.
Fixing conflict