Drupal core 7.22 and modules, added COMMERCE.SQL
conflicts resolved