diff --git a/inxi b/inxi
index 5c8a45b..c9ab802 100755
--- a/inxi
+++ b/inxi
@@ -1780,13 +1780,10 @@ get_distro_data()
 	# this handles case where only one release/version file was found, and it's lsb-release. This would
 	# never apply for ubuntu or debian, which will filter down to the following conditions. In general
 	# if there's a specific distro release file available, that's to be preferred, but this is a good backup.
-<<<<<<< .mine
 	elif [[ -n $distro_file && -f /etc/lsb_release && " $DISTROS_LSB_GOOD" == *" $distro_file "* ]];then
 		distro=$( get_distro_lsb_data )
-=======
 	elif [[ $distro_file == 'lsb-release' ]];then
 		distro=$( get_distro_lsb_data )
->>>>>>> .r394
 	# then if the distro id file was found and it's not in the exluded primary distro file list, read it
 	elif [[ -n $distro_file && -s /etc/$distro_file && " $DISTROS_EXCLUDE_LIST " != *" $distro_file "* ]];then
 		distro=$( remove_erroneous_chars "/etc/$distro_file" )