diff --git a/Dockerfile b/Dockerfile
index d7721d2..6953f51 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,5 +23,8 @@ WORKDIR /app
 
 COPY ./dlgssdpytorch.py ./
 RUN chmod +x dlgssdpytorch.py
+<<<<<<< HEAD
 COPY ./create_dataset.py ./
 RUN chmod +x create_dataset.py
+=======
+>>>>>>> 6f485d6db1dc0417e5862be40269d7075200ad57
diff --git a/dlgssdpytorch.py b/dlgssdpytorch.py
index be14451..fcc3a3d 100644
--- a/dlgssdpytorch.py
+++ b/dlgssdpytorch.py
@@ -112,4 +112,4 @@ for var_name in optimizer.state_dict():
     print(var_name, "\t", optimizer.state_dict()[var_name])
 print("Mean squared error for training: ", np.mean(losses))
 print("Mean squared error for validating: ", np.mean(val_losses))   
-torch.save(model, 'model.pt')
\ No newline at end of file
+torch.save(model, 'model.pt')