diff --git a/libXt-1.1.5.tar.bz2 b/libXt-1.1.5.tar.bz2
deleted file mode 100644
index bf9399f..0000000
Binary files a/libXt-1.1.5.tar.bz2 and /dev/null differ
diff --git a/libXt.spec b/libXt.spec
index 0d1ee4c..d784df8 100644
--- a/libXt.spec
+++ b/libXt.spec
@@ -59,8 +59,16 @@ mkdir -p -m 0755 $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
 %{_docdir}/%{name}/*.xml
 
 %changelog
+<<<<<<< HEAD
 * Fri Jul 24 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.2.0-0
 - updata package
+=======
+* Wed Jun 19 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.2.0-0
+- Type:bugfix
+- Id:NA
+- SUG:NA
+- DESC:change the directory of the license file
+>>>>>>> bf85ee94b061e41743c911cb5b4fb5c602d76815
 
 * Sat Oct 19 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.1.5-11
 - Type:bugfix