Fix conflicts that showed up on drupal-org.make