diff --git a/README.md b/README.md
index 28ff27f..5c28fc9 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,16 @@
+<<<<<<< HEAD
+# FaSTTUBe Logos library for KiCAD 6.0
+## Contents:
+FaSTTUBe_connectors
+FaSTTUBe_logos - FaSTTUBe, LeitOn logos and useful symbols
+FaSTTUBe_microcontrollers
+FaSTTUBe_PnP - parts which are available on tape / reel on the pick-and-place machine
+## How to install
+Download the files and extract them to a "libraries" folder inside your KiCAD project directory.
+Afterwords select "Preferences" and "manage symbol libraries".
+In the new window select the tab "project libraries" and add all libraries (.kicad_sym) using the folder icon.
+Repeat the same for "manage footprint libraries" with all .pretty folders
+=======
 # FaSTTUBe KiCAD libraries
 Created for KiCAD 6.0
 ## How to install
@@ -6,4 +19,5 @@ Tutorial coming soon...
 Add Connector library with:
 - M8 / M12 Connectors
 - Micro-Mate-N-Lok
-- iGrid
\ No newline at end of file
+- iGrid
+>>>>>>> 4650dbcfa29d7a954888b18f01df236a9f87d722