diff --git a/qt5-qtx11extras.spec b/qt5-qtx11extras.spec
index cf36416..6f6f511 100644
--- a/qt5-qtx11extras.spec
+++ b/qt5-qtx11extras.spec
@@ -7,7 +7,7 @@
 Summary: Qt5 - X11 support library
 Name:    qt5-%{qt_module}
 Version: 5.6.0
-Release: 0.2%{?dist}
+Release: 0.3%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -76,6 +76,9 @@ popd
 
 
 %changelog
+* Mon Dec 21 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.3
+- Update to final beta release
+
 * Thu Dec 10 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.2
 - Official beta release
 
diff --git a/sources b/sources
index a1d4869..d87971d 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-d70bbdd6bbcdc4eac602a603f7d8b2b8  qtx11extras-opensource-src-5.6.0-beta.tar.gz
-=======
-d4b050a5409eac91063b84dac2db7ccb  qtx11extras-opensource-src-5.6.0-beta1.tar.xz
->>>>>>> e606df4ace8b4b836517cbbfddfd0f8734a8e6cc
+3714b3816a8136db61829b50da368068  qtx11extras-opensource-src-5.6.0-beta.tar.gz