Files now uploading, still no display
Fixed conficts