manual merge with drupal files