diff --git a/projekt_wyklad_6_freertos/main.c b/projekt_wyklad_6_freertos/main.c
index d19f299..e84d3c7 100644
--- a/projekt_wyklad_6_freertos/main.c
+++ b/projekt_wyklad_6_freertos/main.c
@@ -286,6 +286,7 @@ int main(void)
 //{
 //	for(;;);// user code here
 //}
+<<<<<<< HEAD
 
 // komentarz zdalna edycja 5
 //ISR(BADISR_vect)
@@ -303,4 +304,6 @@ int main(void)
 //ISR(BADISR_vect)
 //{
 //	for(;;);// user code here
-//}
\ No newline at end of file
+//}
+=======
+>>>>>>> 271502b08d2c496d81b2476277453e44ad52af4b