diff --git a/chant_img.php b/chant_img.php
index cc56c4c..02760bd 100755
--- a/chant_img.php
+++ b/chant_img.php
@@ -180,13 +180,6 @@ function makeimgfiles($id, $tex, $suffix = '') {
 	fclose($f[0]);
 	chdir(dirname($f[1]));
 	exec('lualatex --interaction=nonstopmode '.basename($f[1]));
-<<<<<<< HEAD
-	exec('gs -q -dBATCH -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=pnggray -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -r300x300 -sOutputFile='.$path.'png/'.$id.$suffix.'.png -- '.substr($f[1],0,-4).'.pdf -c quit');
-	chmod($path.'png/'.$id.$suffix.'.png', 0666);
-	exec('gs -q -dBATCH -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=pnggray -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -r100x100 -sOutputFile='.$path.$id.$suffix.'.png -- '.substr($f[1],0,-4).'.pdf -c quit');
-	chmod($path.$id.$suffix.'.png', 0666);
-=======
->>>>>>> upstream
 	exec('pdfcrop '.substr($f[1],0,-4).'.pdf '.$path.'pdf/'.$id.$suffix.'.pdf');
 	chmod($path.'pdf/'.$id.$suffix.'.pdf', 0666);
 	exec('gs -q -dBATCH -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=bbox -sDEVICE=pnggray -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -r300x300 -sOutputFile='.$path.'png/'.$id.$suffix.'.png -- '.$path.'pdf/'.$id.$suffix.'.pdf -c quit');