Conflicts: repos/reports/drupaladmin/enabled_contributions.frx repos/reports/drupaladmin/sample_active_users_letter.frx