Update Details And Stuff
git conflicts are annoying