diff --git a/opencivicdata/core/models/base.py b/opencivicdata/core/models/base.py
index ab97681..0b6dc69 100644
--- a/opencivicdata/core/models/base.py
+++ b/opencivicdata/core/models/base.py
@@ -2,10 +2,7 @@
 import re
 import uuid
 from django.db import models
-<<<<<<< Updated upstream
 
-=======
->>>>>>> Stashed changes
 from django.contrib.postgres.fields import ArrayField
 from django.core.validators import RegexValidator