diff --git a/src/asm/a4.asm b/src/asm/a4.asm
index 7474e00..121a342 100644
--- a/src/asm/a4.asm
+++ b/src/asm/a4.asm
@@ -13,7 +13,11 @@ status		db 00000000b	; Statusbyte
 
 tcounts		db 0		; Impulszaehler fuer Servo, Vorwaertszaehler
 tcountv		dw 100 * twait	; Impulszaehler fuer Verzoegerung * 10ms
+<<<<<<< HEAD
+				; Rueckwaertszaehler
+=======
 count		db 8		; Rueckwaertszaehler
+>>>>>>> 0aa2c30f62e6ec53f2e21b4039abeb1581d460d8
 frei		db 'frei  ', 0	; Texte
 belegt		db 'belegt  ', 0
 
@@ -91,6 +95,36 @@ again:
 	
 	times shcnt shr ax, 1
 
+<<<<<<< HEAD
+	cmp ax, 0x0
+	jle ifzero
+
+	cmp ax, 0x0
+	jnz ifnotzero
+
+	jmp again
+
+ifnotzero:
+	mov ah, ascii
+	mov dl, 7
+	mov bx, frei
+	int conout
+
+	jmp again
+
+ifzero: 
+	mov ah, ascii
+	mov dl, 7
+	mov bx, belegt
+	int conout
+
+	mov dx, pieces << shcnt
+	and dx, 10000001b
+	mov [status], dx
+	
+	
+	jmp again
+=======
 	;cmp ax, 0x0
 	;jbe ifzero
 
@@ -106,6 +140,7 @@ ifzero:
 	
 	
 	ret
+>>>>>>> 0aa2c30f62e6ec53f2e21b4039abeb1581d460d8
 
 
 ; Initialisierung Controller und Interruptsystem
@@ -216,3 +251,7 @@ isr_servotimer_out: ; Ausgang aus dem Service
 	iret
  
 
+<<<<<<< HEAD
+
+=======
+>>>>>>> 0aa2c30f62e6ec53f2e21b4039abeb1581d460d8