diff --git a/tigervnc.changes b/tigervnc.changes
index c0a3657..8c9780f 100644
--- a/tigervnc.changes
+++ b/tigervnc.changes
@@ -11,7 +11,6 @@ Mon Jun 13 15:21:19 UTC 2016 - msrb@suse.com
   * Fix zlib stream reset in tight encoding. (bnc#963417)
 
 -------------------------------------------------------------------
->>>>>>> ./tigervnc.changes.rb2c0921742fcc34e855cefa0bc741324
 Tue May 24 12:46:07 UTC 2016 - msrb@suse.com
 
 - Add /etc/pam.d/vnc configuration and add vnc user to shadow