Fresh Drupal 7.22 Install
Resolving merge conflict between local and remote