Fix merge conflicts

Author: ravinkohli

test/conftest.py

@@ -16,6 +16,8 @@
 
 import torch
 
+import torch
+
 from autoPyTorch.data.tabular_validator import TabularInputValidator
 from autoPyTorch.datasets.tabular_dataset import TabularDataset
 from autoPyTorch.utils.backend import create