diff --git a/neofetch b/neofetch
index bf4adf41..3cc84dd6 100755
--- a/neofetch
+++ b/neofetch
@@ -3289,12 +3289,18 @@ get_network() {
         "Mac OS X"|"macOS")
             ActiveNetwork=$(route get default | grep interface | awk '{print $2}')
             ActiveNetworkName=$(networksetup -listallhardwareports | grep -B 1 "$ActiveNetwork" | awk '/Hardware Port/{print}'| awk '{print $3}')
-            if [[ "$ActiveNetworkName" == "Wi-Fi" ]]; then
+            if [[ $ActiveNetworkName == "Wi-Fi" ]]; then
                 LinkSpeed="$(/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport -I | awk '/maxRate/{print}' | awk '{print $2}' )Mbps"
             else
+<<<<<<< HEAD
                 LinkSpeed="$(ifconfig \"$ActiveNetwork\" | awk '/media/{print}' | sed -E "s/.*\((.*)\).*/\1/")"
             fi
             network="\"$ActiveNetwork\": \"$ActiveNetworkName\"@\"$LinkSpeed\""
+=======
+                LinkSpeed="$(ifconfig $ActiveNetwork | awk '/media/{print}' | sed -E "s/.*\((.*)\).*/\1/")"
+            fi
+            network="$ActiveNetwork: $ActiveNetworkName@$LinkSpeed"
+>>>>>>> parent of 3938f431 (shellcheck: double quote)
         ;;
     esac
     while IFS=' ' read -r n i; do