diff --git a/A320-main.xml b/A320-main.xml
index 0e570c5d..41be07d7 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -4369,15 +4369,9 @@
 		<canvas_mcdu>
 			<file>Aircraft/A320-family/Models/Instruments/MCDU/MCDU.nas</file>
 		</canvas_mcdu>
-<<<<<<< Updated upstream
-=======
-		<canvas_qnh>
-			<file>Aircraft/A320-family/Nasal/Displays/CanvasQNH.nas</file>
-		</canvas_qnh>
 		<canvas_qrh>
 			<file>Aircraft/A320-family/Nasal/QRH/QRH.nas</file>
 		</canvas_qrh>
->>>>>>> Stashed changes
 		<mcdu_scratchpad> <!-- delay till after canvas mcdu -->
 			<file>Aircraft/A320-family/Nasal/FMGC/mcdu-messages.nas</file>
 		</mcdu_scratchpad>