diff --git a/bangwallpaper42.vbs b/bangwallpaper42.vbs
index daef488..622c38d 100644
--- a/bangwallpaper42.vbs
+++ b/bangwallpaper42.vbs
@@ -3,11 +3,7 @@ Dim WshShell
 
 Set WshShell = CreateObject("WScript.Shell")
 
-<<<<<<< HEAD
 WshShell.Run "powershell.exe -nologo -NoProfile -ExecutionPolicy Bypass -command .\rotanconv36.ps1", 0, false
-=======
-WshShell.Run "powershell.exe -nologo -NoProfile -ExecutionPolicy Bypass -command .\rotanconv35.ps1", 0, false
->>>>>>> a9ab5839e7ebc1400bdf81aafaa63ca57cb5d7ab
 
 set WshShell = nothing
 WScript.Quit
diff --git a/inst_routine.nsi b/inst_routine.nsi
index 133c845..f6fb2fe 100644
--- a/inst_routine.nsi
+++ b/inst_routine.nsi
@@ -71,11 +71,7 @@ File guisttngs.ps1
 File HELP.hta
 File parrot.ico
 File README.txt
-<<<<<<< HEAD
 File rotanconv36.ps1
-=======
-File rotanconv34.ps1
->>>>>>> a9ab5839e7ebc1400bdf81aafaa63ca57cb5d7ab
 File settings.vbs
    
   CreateShortcut "$SMSTARTUP\Bang Wallpaper Plus.lnk" $INSTDIR\bangwallpaper42.vbs "" $INSTDIR\parrot.ico 0
@@ -121,10 +117,7 @@ Section "Uninstall"
   Delete $INSTDIR\parrot.ico
   Delete $INSTDIR\pwd.txt
   Delete $INSTDIR\README.txt
-<<<<<<< HEAD
   Delete $INSTDIR\rotanconv35.ps1
-=======
->>>>>>> a9ab5839e7ebc1400bdf81aafaa63ca57cb5d7ab
   Delete $INSTDIR\rotanconv34.ps1
   Delete $INSTDIR\rotanconv33.ps1
   Delete $INSTDIR\rotanconv32.ps1
diff --git a/rotanconv36.ps1 b/rotanconv36.ps1
index 47ccd61..5e72ae7 100644
--- a/rotanconv36.ps1
+++ b/rotanconv36.ps1
@@ -391,19 +391,11 @@ function loadandset {
 		if(!$ipaddress) {
 			$ipaddress = (Get-CimInstance Win32_NetworkAdapterConfiguration | ? { $_.IPAddress -ne $null })[0].ipaddress 4> $null
 		}
-<<<<<<< HEAD:rotanconv36.ps1
-=======
-		
->>>>>>> a9ab5839e7ebc1400bdf81aafaa63ca57cb5d7ab:rotanconv35.ps1
 		if(-not ($ipaddress.GetType().IsArray)) {
 			$addresses=[Object[]]::new(1)
 			$addresses[0]=$ipaddress
 			$ipaddress = $addresses
 		}
-<<<<<<< HEAD:rotanconv36.ps1
-=======
-		
->>>>>>> a9ab5839e7ebc1400bdf81aafaa63ca57cb5d7ab:rotanconv35.ps1
 		$ipaddress=$ipaddress | sort-object
 		$username = $env:USERNAME
 	
@@ -446,15 +438,10 @@ function loadandset {
 		# draw strings
 		$Brush = new-Object Drawing.SolidBrush ([System.Drawing.Color]::FromArgb(255, 255, 255, 255))
 		$Image.DrawString($hostname, $Font, $Brush, $voffset, $hoffset, $sFormatNew)
-<<<<<<< HEAD:rotanconv36.ps1
 		$i=0
 		foreach($addr in $ipaddress) {
 			$Image.DrawString($addr, $Font, $Brush, $ivoffset[$i], $hoffset, $sFormatNew)
 			$i = $i + 1
-=======
-		for($i=0; $i -lt $ipaddress.count;$i++) {
-			$Image.DrawString($ipaddress[$i], $Font, $Brush, $ivoffset[$i], $hoffset, $sFormatNew)
->>>>>>> a9ab5839e7ebc1400bdf81aafaa63ca57cb5d7ab:rotanconv35.ps1
 		}
 		$Image.DrawString($username, $Font, $Brush, $uvoffset, $hoffset, $sFormatNew)
 		$bmpFile.rotateflip("Rotate270FlipNone")