Fix merge

ffcx/codegeneration/expressions.py

@@ -7,6 +7,7 @@
 import collections
 import logging
 from typing import Dict, Set, Any, DefaultDict
+from itertools import product
 
 import ufl
 from ffcx.codegeneration import expressions_template

ffcx/parameters.py

@@ -11,6 +11,7 @@
 import os.path
 import pprint
 from typing import Optional, Dict, Any
+from pathlib import Path
 
 logger = logging.getLogger("ffcx")