fix conflict

diskuy/.eslintcache

diskuy/src/App.js

diskuy/src/Navbar.js

diskuy/src/Profile/Profile.js

diskuy/src/Threads/Comment.css

diskuy/src/Threads/Post.css

diskuy/src/Threads/Post.js

diskuy/src/Threads/PreviewThread.js

diskuy/src/Threads/RecentThreads.js

diskuy/src/Threads/Thread.js

diskuy/src/Threads/TopThreads.js