diff --git a/.gitignore b/.gitignore
index 073cbb9..1db007e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1 @@
-/qtbase-opensource-src-5.9.1.tar.xz
-/0086-Fix-detection-of-AT-SPI.patch
-<<<<<<< HEAD
-=======
 /qtbase-opensource-src-5.9.2.tar.xz
->>>>>>> f27