test conflict

Signed-off-by: aviv ron <rona@il.ibm.com>

Author: aviv1ron1

README.md

@@ -154,4 +154,9 @@ Granite Switch was started by IBM Research and is developed in the open. We welc
 
 Apache-2.0 — see [LICENSE](LICENSE).
 
+<<<<<<< HEAD
 ## conflict!!!!
+=======
+## test bla bla bla
+test test
+>>>>>>> ed0bac3f8ac0456efe8441a7523452645f550ff0