merge leftover

Author: kaushikcfd

firedrake/functionspaceimpl.py

@@ -697,11 +697,7 @@ def make_dat(self, val=None, valuetype=None, name=None):
             assert len(val) == len(self)
         else:
             val = [None for _ in self]
-<<<<<<< HEAD
-        return op2.compute_backend.MixedDat(s.make_dat(v, valuetype, "%s[cmpt-%d]" % (name, i), utils._new_uid())
-=======
-        return op2.MixedDat(s.make_dat(v, valuetype, "%s[cmpt-%d]" % (name, i))
->>>>>>> master
+        return op2.compute_backend.MixedDat(s.make_dat(v, valuetype, "%s[cmpt-%d]" % (name, i))
                             for i, (s, v) in enumerate(zip(self._spaces, val)))
 
     @utils.cached_property