diff --git a/.gitignore b/.gitignore
index f9d380c..e90eb4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,7 +100,6 @@ ENV/
# eclipse
.project
.pydevproject
-<<<<<<< HEAD
# vscode
@@ -108,11 +107,7 @@ ENV/
schainpy/scripts/
schaingui/node_modules/
-=======
.svn/
*.png
*.pyc
-schainpy/scripts
-
-schaingui/node_modules
->>>>>>> master
+*.xml
\ No newline at end of file
diff --git a/schainpy/scripts/schain.xml b/schainpy/scripts/schain.xml
index d66526b..4f5a3e2 100644
--- a/schainpy/scripts/schain.xml
+++ b/schainpy/scripts/schain.xml
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file