resolve conflict

diskuy/.eslintcache

diskuy/debug.log

diskuy/src/App.js

diskuy/src/Button.css

diskuy/src/CreateThreadForm.css

diskuy/src/CreateTopicForm.js

diskuy/src/LoginForm.css

diskuy/src/LoginForm.js

diskuy/src/Navbar.js

diskuy/src/Profile/Profile.css

diskuy/src/Profile/Profile.js

diskuy/src/RegisterForm.css

diskuy/src/RegisterForm.js

diskuy/src/Threads/Comment.css

diskuy/src/Threads/CreateThread.css

diskuy/src/Threads/CreateThread.js

diskuy/src/Threads/EditThread.css

diskuy/src/Threads/EditThread.js

diskuy/src/Threads/EditThreadForm.css

diskuy/src/Threads/FormCreateThread.css