diff --git a/README.md b/README.md
index f5c65173..49e4e860 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,12 @@
 # ideas
+<<<<<<< HEAD
 The "ideas" repository for the raywenderlich.com book Mastering Git
+
+This repository is a collection of ideas for articles, content and features at raywenderlich.com 
+
+Feel free to add ideas and mark taken ideas as "done".
+
+Contact: support@razeware.com
+=======
+The "ideas" repository for the raywenderlich.com book Git Apprentice.
+>>>>>>> aed84e7fcaa4e59f22202f755b10af1751472263
diff --git a/articles/clickbait_ideas.md b/articles/clickbait_ideas.md
index e69de29b..35ec4d3f 100644
--- a/articles/clickbait_ideas.md
+++ b/articles/clickbait_ideas.md
@@ -0,0 +1,12 @@
+# Clickbait Article Ideas
+
+These articles shouldn't really have any content, but need titles that are irresistible.
+
+- [ ] Top 10 iOS interview questions
+- [ ] 8 hottest rumours about Swift 5 - EXPOSED
+- [ ] Try these five weird Xcode tips to reduce app bloat
+- [ ] Apple to skip iOS 13, eyes a piece of Android's pie
+- [ ] 15 ways Android beats iOS into the ground and 7 ways it doesn't
+- [ ] I migrated my entire IT department back to Windows XP - and then this happened
+- [ ] The Apple announcement that should worry Swift developers
+- [ ] iOS 13 to bring back skeuomorphism amidst falling iPhone sales
diff --git a/books/book_ideas.md b/books/book_ideas.md
index 1a92ca4e..47674f54 100644
--- a/books/book_ideas.md
+++ b/books/book_ideas.md
@@ -8,3 +8,5 @@
 - [ ] Fortran for fun and profit
 - [x] RxSwift by tutorials
 - [ ] Mastering git
+- [ ] Debugging with tht Grace Hopper Method
+- [ ] Adding something interesting
diff --git a/sitehtml/all-todos.html b/sitehtml/all-todos.html
new file mode 100644
index 00000000..e69de29b
diff --git a/tutorial/tutorial_ideas.md b/tutorial/tutorial_ideas.md
new file mode 100644
index 00000000..4930965c
--- /dev/null
+++ b/tutorial/tutorial_ideas.md
@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+[ ] some ideas
+=======
+[ ] Some Ideas
+>>>>>>> 1890523a7df35d9603b8706edc885fbb6cb9ce7a