diff --git a/earthdiagnostics/datafile.py b/earthdiagnostics/datafile.py
index d29956c48ea4597cb83cc6c54effc2cac34397b7..ec70195b076821cc5baf5295e10d3bdebf6726c3 100644
--- a/earthdiagnostics/datafile.py
+++ b/earthdiagnostics/datafile.py
@@ -17,6 +17,11 @@ from earthdiagnostics.publisher import Publisher
 from earthdiagnostics.variable import VariableType
 
 import netCDF4
+<< << << < HEAD
+
+== == == =
+>>>>>> > Append regions without spaces
+
 
 
 class LocalStatus(object):