setup with all files
merging remote and local