Add all local files
Merge