add drupal files
change file
resolve conflict
change file
Merge branch 'develop'