diff --git a/SPECS/xterm.spec b/SPECS/xterm.spec
index c2ee0c0..53dea97 100644
--- a/SPECS/xterm.spec
+++ b/SPECS/xterm.spec
@@ -54,6 +54,7 @@ done
 	--enable-256-color \
 	--enable-exec-xterm \
 %{?with_trace: --enable-trace} \
+	--enable-luit \
 	--enable-warnings \
 	--enable-wide-chars \
 	--with-app-defaults=%{x11_app_defaults_dir} \
@@ -63,7 +64,7 @@ done
 	--with-tty-group=tty \
 	--disable-full-tgetent \
 	--enable-sixel-graphics \
-  --with-pcre2
+        --with-pcre2
 
 %make_build
 
@@ -103,6 +104,7 @@ install -m644 -p xterm.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata
 %{_mandir}/man1/resize.1*
 
 %changelog
+<<<<<<< HEAD
 * Wed Sep 22 2021 Tomas Korbar <tkorbar@redhat.com> - 369-1
 - Rebase to version 369
 - Resolves: rhbz#2006589
@@ -170,6 +172,51 @@ install -m644 -p xterm.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata
 * Wed Apr 29 2020 Tomas Korbar <tkorbar@redhat.com> - 354-1
 - Rebase to version 354 (#1828107)
 
+||||||| parent of c9568b8 (xterm upda version and options)
+=======
+* Thu Feb 11 2021 Tomas Korbar <tkorbar@redhat.com> - 366-1
+- Rebase to version 366
+- Resolves: rhbz#1927543
+
+* Wed Feb 03 2021 Tomas Korbar <tkorbar@redhat.com> - 364-1
+- Rebase to version 364 (#1924362)
+- Build with pcre2 support (#1909609)
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 363-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jan 19 2021 Tomas Korbar <tkorbar@redhat.com> - 363-1
+- Rebase to version 363 (#1910995)
+- Build with pcre2 support (#1909609)
+
+* Fri Nov 13 2020 Tomas Korbar <tkorbar@redhat.com> - 362-1
+- Rebase to version 362 (#1896986)
+
+* Thu Oct 22 2020 Tomas Korbar <tkorbar@redhat.com> - 361-1
+- Rebase to version 361 (#1888488)
+
+* Mon Sep 21 2020 Tomas Korbar <tkorbar@redhat.com> - 360-1
+- Rebase to version 360 (#1880883)
+
+* Tue Aug 18 2020 Tomas Korbar <tkorbar@redhat.com> - 359-1
+- Rebase to version 359 (#1869418)
+
+* Tue Jul 28 2020 Adam Jackson <ajax@redhat.com> - 358-2
+- BuildRequires luit, not xorg-x11-apps
+
+* Mon Jul 13 2020 Tomas Korbar <tkorbar@redhat.com> - 358-1
+- Rebase to version 358 (#1856126)
+
+* Mon Jul 06 2020 Tomas Korbar <tkorbar@redhat.com> - 357-1
+- Rebase to version 357 (#1853951)
+
+* Sun May 03 2020 Tomas Korbar <tkorbar@redhat.com> - 356-1
+- Rebase to version 356 (#1830237)
+
+* Wed Apr 29 2020 Tomas Korbar <tkorbar@redhat.com> - 354-1
+- Rebase to version 354 (#1828107)
+
+>>>>>>> c9568b8 (xterm upda version and options)
 * Mon Feb 24 2020 Tomas Korbar <tkorbar@redhat.com> - 353-1
 - Rebase to version 353 (#1792091)