aesthetic fix

Author: 9x14S

web/aladin.html

@@ -23,10 +23,8 @@
 					<input id="fits-url" type="url" placeholder="https://data.nasa.gov/sample.fits" aria-label="FITS file URL" />
 					<button type="button" id="load-url">Load URL</button>
 				</div>
-<<<<<<< HEAD
 				<div class="comparison">
 					<button type="button" id="open-comparison">Compare</button>
-=======
 				<div class="marker-actions">
 					<button type="button" id="add-marker" class="marker-control">Add marker</button>
 					<button type="button" id="remove-marker" class="marker-control">Remove marker</button>