diff --git a/Documents/HBuilderProjects/xm/.gitignore b/Documents/HBuilderProjects/xm/.gitignore
index 54f07af..940b8b7 100644
--- a/Documents/HBuilderProjects/xm/.gitignore
+++ b/Documents/HBuilderProjects/xm/.gitignore
@@ -21,4 +21,8 @@ dist-ssr
 *.ntvs*
 *.njsproj
 *.sln
-*.sw?
\ No newline at end of file
+<<<<<<< HEAD
+*.sw?
+=======
+*.sw?
+>>>>>>> 42d0eec2c04687bfcd07b428945c72601bc08cf5