diff --git a/.gitignore b/.gitignore
index a2286f8..b0affad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /fleet-commander-admin-0.7.3.tar.xz
 /fleet-commander-admin-0.7.4.tar.xz
+/fleet-commander-admin-0.7.5.tar.xz
diff --git a/fleet-commander-admin.spec b/fleet-commander-admin.spec
index 32b4296..b8d41ae 100644
--- a/fleet-commander-admin.spec
+++ b/fleet-commander-admin.spec
@@ -1,5 +1,9 @@
 Name:           fleet-commander-admin
+<<<<<<< HEAD
 Version:        0.7.4
+=======
+Version:        0.7.5
+>>>>>>> f24
 Release:        1%{?dist}
 Summary:        Fleet Commander
 
@@ -99,6 +103,13 @@ getent passwd fleet-commander-admin >/dev/null || /usr/sbin/useradd -M -r -d %{_
 %{_sysconfdir}/xdg/autostart/fleet-commander-logger.desktop
 
 %changelog
+<<<<<<< HEAD
+=======
+* Thu Mar 31 2016 ogutierr <ogutierr@redhat.com> - 0.7.5-1
+- Fixed spice reconnection problems
+- Updated package for 0.7.5 release
+
+>>>>>>> f24
 * Tue Mar 08 2016 ogutierr <ogutierrez@redhat.com> - 0.7.4-1
 - Update package for 0.7.4 release
 
diff --git a/sources b/sources
index 46f1fef..a81bd53 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d75ac2caa709544385b8e8dbfd498689  fleet-commander-admin-0.7.4.tar.xz
+9d29499b7faa9f88a5153e0915b8c86d  fleet-commander-admin-0.7.5.tar.xz