diff --git a/CHANGELIST b/CHANGELIST
index 75081d7..873c90a 100644
--- a/CHANGELIST
+++ b/CHANGELIST
@@ -1,8 +1,5 @@
-<<<<<<< HEAD
-=======
 1.4.6c merged @gusson's pull request to add -sshport argument
 
->>>>>>> gusson-ssh_port
 1.4.6b updated default cipherlist for syncoid to 
        chacha20-poly1305@openssh.com,arcfour - arcfour isn't supported on
        newer SSH (in Ubuntu Xenial and FreeBSD), chacha20 isn't supported on
diff --git a/findoid b/findoid
index 998099e..a7121d5 100755
--- a/findoid
+++ b/findoid
@@ -11,11 +11,7 @@ use warnings;
 my $zfs = '/sbin/zfs';
 my %args = getargs(@ARGV);
 
-<<<<<<< HEAD
-my $progversion = '1.4.6b';
-=======
 my $progversion = '1.4.6c';
->>>>>>> gusson-ssh_port
 
 if ($args{'version'}) { print "$progversion\n"; exit 0; }
 
diff --git a/sanoid b/sanoid
index 2ecff59..fe50d61 100755
--- a/sanoid
+++ b/sanoid
@@ -4,11 +4,7 @@
 # from http://www.gnu.org/licenses/gpl-3.0.html on 2014-11-17.  A copy should also be available in this
 # project's Git repository at https://github.com/jimsalterjrs/sanoid/blob/master/LICENSE.
 
-<<<<<<< HEAD
-my $version = '1.4.6b';
-=======
 my $version = '1.4.6c';
->>>>>>> gusson-ssh_port
 
 use strict;
 use Config::IniFiles;   # read samba-style conf file
diff --git a/syncoid b/syncoid
index 61c1a17..cf3616c 100755
--- a/syncoid
+++ b/syncoid
@@ -4,11 +4,7 @@
 # from http://www.gnu.org/licenses/gpl-3.0.html on 2014-11-17.  A copy should also be available in this
 # project's Git repository at https://github.com/jimsalterjrs/sanoid/blob/master/LICENSE.
 
-<<<<<<< HEAD
-my $version = '1.4.6b';
-=======
 my $version = '1.4.6c';
->>>>>>> gusson-ssh_port
 
 use strict;
 use Data::Dumper;
@@ -30,10 +26,7 @@ my $zfscmd = '/sbin/zfs';
 my $sshcmd = '/usr/bin/ssh';
 my $pscmd = '/bin/ps';
 my $sshcipher = '-c chacha20-poly1305@openssh.com,arcfour';
-<<<<<<< HEAD
-=======
 my $sshport = '-p 22';
->>>>>>> gusson-ssh_port
 my $pvcmd = '/usr/bin/pv';
 my $mbuffercmd = '/usr/bin/mbuffer';
 my $sudocmd = '/usr/bin/sudo';