fixing the stuff
fixing merge conflicts
Adding our images
removing and fixing the git cache