old_contents: from jinja2 import Environment, FileSystemLoader 
  import datetime
  import json
  env = Environment(loader=FileSystemLoader('templates'), autoescape=True)
  
  names_template = env.get_template('names.html')
  area_template = env.get_template('areas.html')
  
  with open("output/templates.js") as templatesjs:
      templates = templatesjs.read()
  
  with open("processed/area_matches.json") as area_matches_file:
      area_matches = json.load(area_matches_file)
  
  with open('output/areas.html', 'w+') as name_output:
      name_output.write(area_template.render(
          templates=templates,
          area_matches=area_matches,
          date=datetime.date.today().isoformat(),
      ))
  
  with open("processed/interesting_names.json") as interesting_names_file:
      interesting_names = json.load(interesting_names_file)
  
  with open('output/names.html', 'w+') as name_output:
      name_output.write(names_template.render(
          templates=templates,
          interesting_names=interesting_names,
          interesting_names_json=json.dumps(interesting_names),
          date=datetime.date.today().isoformat(),
      ))
  
new_contents: from jinja2 import Environment, FileSystemLoader 
  import datetime
  import json
  env = Environment(loader=FileSystemLoader('templates'), autoescape=True)
  
  names_template = env.get_template('names.html')
  area_template = env.get_template('areas.html')
  
  with open("output/templates.js") as templatesjs:
      templates = templatesjs.read()
  
  with open("processed/area_matches.json") as area_matches_file:
      area_matches = json.load(area_matches_file)
  
  with open('output/areas.html', 'w+') as name_output:
      name_output.write(area_template.render(
          templates=templates,
          area_matches=area_matches,
          date=datetime.date.today().isoformat(),
      ))
  
  with open("processed/interesting_names.json") as interesting_names_file:
      interesting_names = json.load(interesting_names_file)
  
  with open('output/names.html', 'w+') as name_output, open("key_field_names.txt") as key_field_names_file:
      key_fields = list(set([key_field_name.strip() for key_field_name in key_field_names_file]))
      name_output.write(names_template.render(
          templates=templates,
          interesting_names=interesting_names,
          interesting_names_json=json.dumps(interesting_names),
          date=datetime.date.today().isoformat(),
          key_fields_json=json.dumps(key_fields),
      ))
  
  
subject: Fix due to merge conflicts