Fixed the conflicts and added everything into the app